diff options
| -rw-r--r-- | library/Android.mk | 50 | ||||
| -rw-r--r-- | library/common-eclair-mr1.mk | 57 | ||||
| -rw-r--r-- | library/common-full-support.mk | 70 |
3 files changed, 0 insertions, 177 deletions
diff --git a/library/Android.mk b/library/Android.mk index 9d037da..58caa77 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -18,56 +18,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src) include $(BUILD_STATIC_JAVA_LIBRARY) -## -# Deprecated. Use gingerbread-compat instead. -# Build eclair-mr1-compat library, which uses AppCompat support library to provide backwards -# compatibility back to SDK v7. -# - -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 := \ - $(LOCAL_PATH)/main/res \ - $(LOCAL_PATH)/eclair-mr1/res -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src) -LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v7-appcompat - -include $(BUILD_STATIC_JAVA_LIBRARY) - - -## -# Deprecated. Use gingerbread-compat instead. -# Build the full-support library, which includes RecyclerView and any other support libraries as -# they are integrated. -# -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 := \ - $(LOCAL_PATH)/main/res \ - $(LOCAL_PATH)/eclair-mr1/res \ - $(LOCAL_PATH)/full-support/res -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-v4 \ - android-support-v7-appcompat \ - android-support-v7-recyclerview - -include $(BUILD_STATIC_JAVA_LIBRARY) - ## # Build gingerbread-compat library, which uses AppCompat support library to provide backwards diff --git a/library/common-eclair-mr1.mk b/library/common-eclair-mr1.mk deleted file mode 100644 index d59e043..0000000 --- a/library/common-eclair-mr1.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Deprecated. Use gingerbread-compat instead. -# -# Include this make file to build your application against this module. -# -# Make sure to include it after you've set all your desired LOCAL variables. -# Note that you must explicitly set your LOCAL_RESOURCE_DIR before including this file. -# -# For example: -# -# LOCAL_RESOURCE_DIR := \ -# $(LOCAL_PATH)/res -# -# include frameworks/opt/setupwizard/library/common-eclair-mr1.mk -# - -ifneq ($(LOCAL_USE_AAPT2),true) - -# Check that LOCAL_RESOURCE_DIR is defined -ifeq (,$(LOCAL_RESOURCE_DIR)) -$(error LOCAL_RESOURCE_DIR must be defined) -endif - -# Add --auto-add-overlay flag if not present -ifeq (,$(findstring --auto-add-overlay, $(LOCAL_AAPT_FLAGS))) -LOCAL_AAPT_FLAGS += --auto-add-overlay -endif - -# Include setup wizard library, if not already included -ifeq (,$(findstring setup-wizard-lib-eclair-mr1-compat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += \ - $(call my-dir)/main/res \ - $(call my-dir)/eclair-mr1/res -LOCAL_AAPT_FLAGS += --extra-packages com.android.setupwizardlib -LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib-eclair-mr1-compat -endif - -## Include transitive dependencies below - -# Include support-v7-appcompat, if not already included -ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat -endif - -else # LOCAL_USE_AAPT2 := true - -ifeq (,$(findstring setup-wizard-lib-eclair-mr1-compat,$(LOCAL_STATIC_ANDROID_LIBRARIES))) - LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-eclair-mr1-compat -endif - -ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES))) - LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat -endif - -endif # LOCAL_USE_AAPT2 diff --git a/library/common-full-support.mk b/library/common-full-support.mk deleted file mode 100644 index 7153b16..0000000 --- a/library/common-full-support.mk +++ /dev/null @@ -1,70 +0,0 @@ -# -# Deprecated. Use gingerbread-compat instead. -# -# Include this make file to build your application against this module. -# -# Make sure to include it after you've set all your desired LOCAL variables. -# Note that you must explicitly set your LOCAL_RESOURCE_DIR before including this file. -# -# For example: -# -# LOCAL_RESOURCE_DIR := \ -# $(LOCAL_PATH)/res -# -# include frameworks/opt/setupwizard/library/common-full-support.mk -# - -ifneq ($(LOCAL_USE_AAPT2),true) - -# Check that LOCAL_RESOURCE_DIR is defined -ifeq (,$(LOCAL_RESOURCE_DIR)) -$(error LOCAL_RESOURCE_DIR must be defined) -endif - -# Add --auto-add-overlay flag if not present -ifeq (,$(findstring --auto-add-overlay, $(LOCAL_AAPT_FLAGS))) -LOCAL_AAPT_FLAGS += --auto-add-overlay -endif - -# Include setup wizard library, if not already included -ifeq (,$(findstring setup-wizard-lib-full-support,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += \ - $(call my-dir)/main/res \ - $(call my-dir)/eclair-mr1/res \ - $(call my-dir)/full-support/res -LOCAL_AAPT_FLAGS += --extra-packages com.android.setupwizardlib -LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib-full-support -endif - -## Include transitive dependencies below - -# Include support-v7-appcompat, if not already included -ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat -endif - -# Include support-v7-recyclerview, if not already included -ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview -endif - -else # LOCAL_USE_AAPT2 := true - -ifeq (,$(findstring setup-wizard-lib-full-support,$(LOCAL_STATIC_ANDROID_LIBRARIES))) - LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-full-support -endif - -ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES))) - LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat -endif - -ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES))) - LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview -endif - -endif # LOCAL_USE_AAPT2 - |