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

Commit 10ed86af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Build rule cleanup" into ub-launcher3-master

parents cdbf19aa a68fba3a

Android.mk

+4 −12
Original line number Diff line number Diff line
@@ -23,12 +23,7 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib

else

    LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore

endif



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src_plugins)
@@ -151,11 +146,10 @@ LOCAL_USE_AAPT2 := true 
LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif
@@ -224,11 +218,10 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif
@@ -271,11 +264,10 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif

tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


ifneq (,$(wildcard frameworks/base))

else

    LOCAL_STATIC_JAVA_LIBRARIES += libSharedSystemUI

    LOCAL_STATIC_JAVA_LIBRARIES += SystemUISharedLib



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

        ../src/com/android/launcher3/ResourceUtils.java \