| Revision | fa5863684396093d425c30d25668185161adb8f0 (tree) |
|---|---|
| Zeit | 2019-11-08 15:09:43 |
| Autor | Braden Farmer <farmerbb@gmai...> |
| Commiter | Braden Farmer |
Revert "Switch to LOCAL_STATIC_ANDROID_LIBRARIES"
This reverts commit 7e41156819215733176f14c4f05660c18a22182a.
Android.mk (diff)| @@ -1,12 +1,13 @@ | ||
| 1 | 1 | LOCAL_PATH := $(call my-dir) |
| 2 | 2 | include $(CLEAR_VARS) |
| 3 | 3 | |
| 4 | +appcompat_dir := frameworks/support/v7/appcompat | |
| 4 | 5 | res_dir := app/src/main/res |
| 5 | 6 | nonlib_res_dir := app/src/nonlib/res |
| 6 | 7 | |
| 7 | 8 | LOCAL_MODULE_TAGS := optional |
| 8 | 9 | |
| 9 | -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/$(res_dir) $(LOCAL_PATH)/$(nonlib_res_dir) | |
| 10 | +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/$(res_dir) $(LOCAL_PATH)/$(nonlib_res_dir) $(appcompat_dir)/res | |
| 10 | 11 | |
| 11 | 12 | LOCAL_SRC_FILES := \ |
| 12 | 13 | $(call all-java-files-under, app/src/main/java) \ |
| @@ -17,7 +18,7 @@ LOCAL_SRC_FILES := \ | ||
| 17 | 18 | |
| 18 | 19 | LOCAL_MANIFEST_FILE := app/src/androidx86/AndroidManifest.xml |
| 19 | 20 | |
| 20 | -LOCAL_STATIC_ANDROID_LIBRARIES := \ | |
| 21 | +LOCAL_STATIC_JAVA_LIBRARIES := \ | |
| 21 | 22 | android-support-v4 \ |
| 22 | 23 | android-support-v7-appcompat \ |
| 23 | 24 | android-support-design |
| @@ -34,6 +35,8 @@ LOCAL_PRIVILEGED_MODULE := true | ||
| 34 | 35 | |
| 35 | 36 | LOCAL_AAPT_FLAGS := \ |
| 36 | 37 | --auto-add-overlay \ |
| 37 | - --rename-manifest-package com.farmerbb.taskbar.androidx86 | |
| 38 | + --rename-manifest-package com.farmerbb.taskbar.androidx86 \ | |
| 39 | + --extra-packages android.support.v7.appcompat \ | |
| 40 | + --extra-packages android.support.design | |
| 38 | 41 | |
| 39 | 42 | include $(BUILD_PACKAGE) |
Android-x86
Fork