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

Merge ab/6749736 in stage.

Browse Source 
Bug: 167233921
Merged-In: Ib2b2aad76699226b54a0ea9b98dacdea1527363d
Change-Id: I8d3e3c35a7c8d268b916c01eb5f2e065cbb5bf24
This commit is contained in:
Xin Li
2020-10-08 22:57:45 -07:00
parent d0edac4eea 0c0e7dcfcb
commit fb486680d5
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Android.mk
View File

@@ -98,6 +98,9 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiaut
# org.apache.http.legacy.jar stubs # org.apache.http.legacy.jar stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar
# Android Automotive OS stubs
ALL_SDK_FILES += $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar
# test stubs # test stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar

11
build/README.md Normal file
View File

@@ -0,0 +1,11 @@
# Android SDK
This directory contains configuration for building Android SDK. The root
configuration file is `sdk.atree`.
## Building the SDK
```
$ lunch sdk
$ m -j sdk
```

5
build/optional.json
View File

@@ -4,6 +4,11 @@
"jar": "org.apache.http.legacy.jar", "jar": "org.apache.http.legacy.jar",
"manifest": false "manifest": false
}, },
{
"name": "android.car",
"jar": "android.car.jar",
"manifest": false
},
{ {
"name": "android.test.mock", "name": "android.test.mock",
"jar": "android.test.mock.jar", "jar": "android.test.mock.jar",

7
build/sdk.atree
View File

@@ -17,11 +17,6 @@
# #
# These are the files that comprise that SDK. # These are the files that comprise that SDK.
# #
# The files that will go in the tools folder are setup through
# sdk/build/tools.atree
# This is to help when the sdk.git project is branched differently from
# the other projects.
#
############################################################################## ##############################################################################
# SDK Root folder # SDK Root folder
@@ -173,6 +168,8 @@ development/build/optional.json
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar
# deprecated APIs # deprecated APIs
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar
# Android Automotive OS stubs.
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.car.jar
# Test APIs # Test APIs
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.mock.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.mock.jar
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.base.jar ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/android.test.base.jar

2
sdk/build_tools_source.prop_template
View File

@@ -1,3 +1,3 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1 Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2
#Pkg.Revision=30.0.0 rc4 #Pkg.Revision=30.0.0 rc4

2
sdk/platform_source.prop_template
View File

@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION} Platform.Version=${PLATFORM_VERSION}
Platform.CodeName= Platform.CodeName=
Pkg.Revision=2 Pkg.Revision=3
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
Layoutlib.Api=15 Layoutlib.Api=15