Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e20d23c authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong_support_libs" 

* changes:
  convert Uibench test to aapt2
  Migrate PrintSpooler to aapt2.
  Migrate to AAPT2
parents b466949e ce93a98e

packages/PrintSpooler/Android.mk

+14 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res frameworks/support/v7/recyclerview/res

LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages android.support.v7.recyclerview

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_USE_AAPT2 := true

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES += \

    src/com/android/printspooler/renderer/IPdfRenderer.aidl \
@@ -29,7 +29,16 @@ LOCAL_PACKAGE_NAME := PrintSpooler 
LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_JNI_SHARED_LIBRARIES := libprintspooler_jni

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview

LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v7-recyclerview \

    android-support-compat \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-annotations



include $(BUILD_PACKAGE)

packages/SettingsLib/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ include $(CLEAR_VARS) 


LOCAL_USE_AAPT2 := true



LOCAL_AAPT2_ONLY := true



LOCAL_MODULE := SettingsLib



LOCAL_SHARED_ANDROID_LIBRARIES := \

packages/SettingsLib/common.mk

+0 −42
Original line number Diff line number Diff line
@@ -13,49 +13,7 @@ 
#   include frameworks/base/packages/SettingsLib/common.mk

#



ifeq ($(LOCAL_USE_AAPT2),true)

LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-annotations \

    android-support-v4 \

    SettingsLib
 
else

LOCAL_RESOURCE_DIR += $(call my-dir)/res





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



# Include android-support-v7-preference, if not already included

ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference

endif



# Include android-support-v14-preference, if not already included

ifeq (,$(findstring android-support-v14-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))

LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference

endif



LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib



LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-support-v4 \

    SettingsLib

endif

tests/UiBench/Android.mk

+5 −17
Original line number Diff line number Diff line
@@ -10,23 +10,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 


# use appcompat/support lib from the tree, so improvements/

# regressions are reflected in test data

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    frameworks/support/design/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/cardview/res \

    frameworks/support/v7/recyclerview/res \

    frameworks/support/v17/leanback/res



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages android.support.design \

    --extra-packages android.support.v7.appcompat \

    --extra-packages android.support.v7.cardview \

    --extra-packages android.support.v7.recyclerview \

    --extra-packages android.support.v17.leanback



LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_USE_AAPT2 := true



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-design \

    android-support-v4 \

    android-support-v7-appcompat \