diff options
| author | Alan Viverette <alanv@google.com> | 2017-04-21 10:50:38 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2017-04-21 11:00:04 -0400 |
| commit | 41cbf856e79a56b73384eed9808e1a3e77347fc2 (patch) | |
| tree | 32300d4dcfc5d40557a2642f10b90426d3b3fcef | |
| parent | 5805f6cee4b36891435a85a7f59af6a4c1fbeb7e (diff) | |
| download | android_packages_apps_DeskClock-41cbf856e79a56b73384eed9808e1a3e77347fc2.tar.gz android_packages_apps_DeskClock-41cbf856e79a56b73384eed9808e1a3e77347fc2.tar.bz2 android_packages_apps_DeskClock-41cbf856e79a56b73384eed9808e1a3e77347fc2.zip | |
Use explicit support library prebuilts
Removes proguard flag references which were not used.
Test: make DeskClock
Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: Iff7718ac5d7ece471e6eb9a17e2b8cc5bdbd2903
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/Android.mk b/Android.mk index 52f565df9..47a3fa5f6 100644 --- a/Android.mk +++ b/Android.mk @@ -3,18 +3,6 @@ include $(CLEAR_VARS) LOCAL_RESOURCE_DIR := packages/apps/DeskClock/res -ifeq ($(TARGET_BUILD_APPS),) -LOCAL_RESOURCE_DIR += frameworks/support/compat/res -LOCAL_RESOURCE_DIR += frameworks/support/design/res -LOCAL_RESOURCE_DIR += frameworks/support/percent/res -LOCAL_RESOURCE_DIR += frameworks/support/transition/res -LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res -LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res -LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res -LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res -LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res -else -LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/compat/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/transition/res @@ -23,7 +11,6 @@ LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res -endif LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := current @@ -33,19 +20,15 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock LOCAL_SRC_FILES := $(call all-java-files-under, src gen) -LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.pro -LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro -LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-design -LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent -LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview +LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference-prebuilt +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview-prebuilt LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages android.support.compat |