PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[SuwLib] Use support-annotation as a java library"

Browse source
This commit is contained in:
Maurice Lam 2016-12-06 19:02:01 +00:00 committed by Android (Google) Code Review
parent 24a8b72c61 8b6b324487
commit d0e560cdc0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/Android.mk
View file

@ -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