LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Package framework.aidl produced by Soong" am: f504f3a6ba

Browse Source 
am: 619cad04f9

Change-Id: I6fe172ad4dfa58b01e4d6576d75847f4b93c5caf
This commit is contained in:
Colin Cross
2019-04-21 10:39:16 -07:00
committed by android-build-merger
parent aace7b7129 619cad04f9
commit 66b8c2e2bb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Android.mk
View File

@@ -111,6 +111,10 @@ ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid
# ======= Lint API XML ===========
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-stubs-docs_generated-api-versions.xml
# ============ SDK AIDL ============
$(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl
# ============ System SDK ============
full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_system_stubs_current,,COMMON)/classes.jar

2
build/sdk.atree
View File

@@ -180,7 +180,7 @@ ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.base.stubs_intermediate
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.runner.jar
# the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
${OUT_DIR}/target/common/obj/PACKAGING/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
# emulator skins from sdk.git
development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA