packages/apps/Taskbar
Revision | e9036ba7a31acf82cbf00bdbf908d5cbe90c0663 (tree) |
---|---|
Time | 2019-02-28 01:32:57 |
Author | Braden Farmer <farmerbb@gmai...> |
Commiter | GitHub |
Merge pull request #66 from cwhuang/master
Fix building errors in Android 9
@@ -1,13 +1,12 @@ | ||
1 | 1 | LOCAL_PATH := $(call my-dir) |
2 | 2 | include $(CLEAR_VARS) |
3 | 3 | |
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 | |
7 | 6 | |
8 | 7 | LOCAL_MODULE_TAGS := optional |
9 | 8 | |
10 | -LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) | |
9 | +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/$(res_dir) $(appcompat_dir)/res | |
11 | 10 | |
12 | 11 | LOCAL_SRC_FILES := \ |
13 | 12 | $(call all-java-files-under, app/src/main/java) \ |
@@ -27,6 +26,8 @@ LOCAL_PACKAGE_NAME := Taskbar | ||
27 | 26 | |
28 | 27 | LOCAL_JAVA_LANGUAGE_VERSION := 1.8 |
29 | 28 | |
29 | +LOCAL_SDK_VERSION := current | |
30 | + | |
30 | 31 | LOCAL_PRIVILEGED_MODULE := true |
31 | 32 | |
32 | 33 | LOCAL_AAPT_FLAGS := \ |