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

Commit a1bdce38 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove undefined all-aidl-files-under" am: ab5ac781 am: f21b1612 

am: 224f8e69

Change-Id: I520540d252c2c8bce0885c6902097753094a89e6
parents 39f143e7 224f8e69

location/lib/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE:= com.android.location.provider

LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

            $(call all-subdir-java-files) \

            $(call all-aidl-files-under, java)

LOCAL_SRC_FILES := $(call all-subdir-java-files)



include $(BUILD_JAVA_LIBRARY)

media/lib/remotedisplay/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE:= com.android.media.remotedisplay

LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

            $(call all-java-files-under, java) \

            $(call all-aidl-files-under, java)

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



include $(BUILD_JAVA_LIBRARY)

media/lib/signer/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE:= com.android.mediadrm.signer

LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

            $(call all-java-files-under, java) \

            $(call all-aidl-files-under, java)

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



include $(BUILD_JAVA_LIBRARY)

media/lib/tvremote/Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE:= com.android.media.tv.remoteprovider

LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

            $(call all-java-files-under, java) \

            $(call all-aidl-files-under, java)

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



LOCAL_DEX_PREOPT := false