diff options
| author | Ian Lake <ilake@google.com> | 2017-07-18 14:28:51 -0700 |
|---|---|---|
| committer | Ian Lake <ilake@google.com> | 2017-07-18 14:28:51 -0700 |
| commit | 71ec2f20fb977dc1093a79c64d59687d0a66bbaa (patch) | |
| tree | 4804b5c8aa7d66aff8de8662c0c791330f214fc0 | |
| parent | e0f82c38b1825e201de867d2f80ace5b93d11ea7 (diff) | |
| download | chips-71ec2f20fb977dc1093a79c64d59687d0a66bbaa.tar.gz | |
Reduce chips dependencies to only support-compat
Remove dependency on all of support-v4. This fixes
issues where media-compat resources were not properly
being included - they were never needed in the first place.
Also updates sample to pull in libchips as an Android
library (and hence include its resources automatically).
Test: make -j32 PRODUCT-sailfish-userdebug
ANDROID_COMPILE_WITH_JACK=false java-dex tests
BUG: 28983951
Change-Id: I298a0b6e54e20b58c95d1db1e071c332a6f25ffb
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | sample/Android.mk | 13 |
2 files changed, 7 insertions, 10 deletions
@@ -16,7 +16,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libchips -LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4 +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-compat \ + android-support-annotations LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ diff --git a/sample/Android.mk b/sample/Android.mk index 456df36..a572bff 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -14,10 +14,6 @@ LOCAL_PATH:= $(call my-dir) -# Include res dir from chips -chips_dir := ../res -local_res_dirs := res $(chips_dir) - ################################################## # Build APK include $(CLEAR_VARS) @@ -25,17 +21,16 @@ include $(CLEAR_VARS) src_dirs := src LOCAL_PACKAGE_NAME := libChipsSample -LOCAL_STATIC_JAVA_LIBRARIES += libchips - LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v7-appcompat \ - android-support-v4 + libchips \ + android-support-compat \ + android-support-annotations LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-logtags-files-under, $(src_dirs)) -LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(local_res_dirs)) +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) |