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

Commit 52b6961f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "frameworks: Fix javadoc error for SDK build"

parents e482baee b1663130

core/vendor-jars.mk

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
# This file contains list of  vendor framework jars

# Make sure this file inclusion is added after

# LOCAL_JAVA_LIBRARIES defined in your module





# Add vendor jars here

VENDOR_FRAMEWORKS_CORE_JARS := \

     org.codeaurora.Performance





#Update the LOCAL_JAVA_LIBRARIES

ifneq ($(strip $(VENDOR_FRAMEWORKS_CORE_JARS)),)

LOCAL_JAVA_LIBRARIES += $(VENDOR_FRAMEWORKS_CORE_JARS)

endif

services/java/Android.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -15,4 +15,8 @@ LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common 




include $(BUILD_JAVA_LIBRARY)

include $(BUILD_JAVA_LIBRARY)





#Include the vendor-jars.mk to add dependency frameworks

#core packages by vendor to  LOCAL_JAVA_LIBRARIES

-include frameworks/base/core/vendor-jars.mk



include $(BUILD_DROIDDOC)
 
include $(BUILD_DROIDDOC)