diff options
| author | Maurice Lam <yukl@google.com> | 2016-12-05 12:14:38 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2016-12-05 21:34:53 +0000 |
| commit | 8b6b324487417702f22eb37bcdbbef4b72b565f4 (patch) | |
| tree | a57ddf8081abf53e4d1c16bd2df0e1281f22e031 /library/Android.mk | |
| parent | 90f96707025dd678667f6f8ddf8a25bda5007433 (diff) | |
| download | setupwizard-8b6b324487417702f22eb37bcdbbef4b72b565f4.tar.gz | |
[SuwLib] Use support-annotation as a java library
support-annotation does not have any resources so we can just depend
on it as a java library. This fixes "unbundled" builds where the
support-annotation library is defined as a prebuilt rather than built
from source.
Test: `mma` and `m TARGET_BUILD_APPS=clockwork-setup-robotests-coverage-xml` builds
Bug: 33329949
Change-Id: Id35b04225aded984f638bd99a2c8198179974eba
Diffstat (limited to 'library/Android.mk')
| -rw-r--r-- | library/Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/library/Android.mk b/library/Android.mk index 63a64a9..d8abe5c 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -6,14 +6,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true +LOCAL_JAVA_LIBRARIES := \ + android-support-annotations LOCAL_MANIFEST_FILE := main/AndroidManifest.xml LOCAL_MODULE := setup-wizard-lib LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/main/res \ $(LOCAL_PATH)/platform/res LOCAL_SDK_VERSION := current -LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-annotations LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src) include $(BUILD_STATIC_JAVA_LIBRARY) @@ -26,6 +26,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true +LOCAL_JAVA_LIBRARIES := \ + android-support-annotations LOCAL_MANIFEST_FILE := main/AndroidManifest.xml LOCAL_MODULE := setup-wizard-lib-eclair-mr1-compat LOCAL_RESOURCE_DIR := \ @@ -34,7 +36,6 @@ LOCAL_RESOURCE_DIR := \ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src) LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-annotations \ android-support-v4 \ android-support-v7-appcompat @@ -48,6 +49,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true +LOCAL_JAVA_LIBRARIES := \ + android-support-annotations LOCAL_MANIFEST_FILE := main/AndroidManifest.xml LOCAL_MODULE := setup-wizard-lib-full-support LOCAL_RESOURCE_DIR := \ @@ -57,7 +60,6 @@ LOCAL_RESOURCE_DIR := \ LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src full-support/src) LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-annotations \ android-support-v4 \ android-support-v7-appcompat \ android-support-v7-recyclerview |