Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Taskbar: Commit

packages/apps/Taskbar


Commit MetaInfo

Revisione9036ba7a31acf82cbf00bdbf908d5cbe90c0663 (tree)
Time2019-02-28 01:32:57
AuthorBraden Farmer <farmerbb@gmai...>
CommiterGitHub

Log Message

Merge pull request #66 from cwhuang/master

Fix building errors in Android 9

Change Summary

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -1,13 +1,12 @@
11 LOCAL_PATH := $(call my-dir)
22 include $(CLEAR_VARS)
33
4-appcompat_dir := ../../../frameworks/support/v7/appcompat
5-design_dir := ../../../frameworks/support/design
6-res_dir := app/src/main/res $(appcompat_dir)/res $(design_dir)/res
4+appcompat_dir := frameworks/support/v7/appcompat
5+res_dir := app/src/main/res
76
87 LOCAL_MODULE_TAGS := optional
98
10-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
9+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/$(res_dir) $(appcompat_dir)/res
1110
1211 LOCAL_SRC_FILES := \
1312 $(call all-java-files-under, app/src/main/java) \
@@ -27,6 +26,8 @@ LOCAL_PACKAGE_NAME := Taskbar
2726
2827 LOCAL_JAVA_LANGUAGE_VERSION := 1.8
2928
29+LOCAL_SDK_VERSION := current
30+
3031 LOCAL_PRIVILEGED_MODULE := true
3132
3233 LOCAL_AAPT_FLAGS := \
Show on old repository browser