diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-15 23:52:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-15 23:52:17 +0000 |
| commit | 912ff3f8828a300b86e58688aa5b3107990f1d33 (patch) | |
| tree | 366eca5364f026548c4d23c60d15011bcc6ff051 | |
| parent | 373beeede5a17e3d98766ba2b1b97fd3daa55a2c (diff) | |
| parent | 5e246efc28453c07b673d408c7ad5abbe8bac0a0 (diff) | |
| download | development-android-mainline-11.0.0_r3.tar.gz | |
Snap for 6838321 from 5e246efc28453c07b673d408c7ad5abbe8bac0a0 to mainline-releaseandroid-mainline-11.0.0_r9android-mainline-11.0.0_r3android-mainline-11.0.0_r29android11-mainline-sparse-2020-dec-release
Change-Id: I0382fd2dd80b9789043dc965002190152db2e5f5
| -rw-r--r-- | build/Android.mk | 3 | ||||
| -rw-r--r-- | build/README.md | 11 | ||||
| -rw-r--r-- | build/optional.json | 5 | ||||
| -rw-r--r-- | build/sdk.atree | 7 | ||||
| -rw-r--r-- | sdk/build_tools_source.prop_template | 2 | ||||
| -rw-r--r-- | sdk/platform_source.prop_template | 2 |
6 files changed, 23 insertions, 7 deletions
diff --git a/build/Android.mk b/build/Android.mk index 220fee77d..8e361e982 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -101,6 +101,9 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiaut # org.apache.http.legacy.jar stubs 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 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 diff --git a/build/README.md b/build/README.md new file mode 100644 index 000000000..8bb2df451 --- /dev/null +++ b/build/README.md @@ -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 +``` diff --git a/build/optional.json b/build/optional.json index 4b3bedf9a..b63c165e8 100644 --- a/build/optional.json +++ b/build/optional.json @@ -5,6 +5,11 @@ "manifest": false }, { + "name": "android.car", + "jar": "android.car.jar", + "manifest": false + }, + { "name": "android.test.mock", "jar": "android.test.mock.jar", "manifest": false diff --git a/build/sdk.atree b/build/sdk.atree index cf96ed5db..8fb30d53d 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -17,11 +17,6 @@ # # 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 @@ -172,6 +167,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 # deprecated APIs ${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 ${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 diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template index 49c19adf1..90ecc2a41 100644 --- a/sdk/build_tools_source.prop_template +++ b/sdk/build_tools_source.prop_template @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1 +Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2 #Pkg.Revision=30.0.0 rc4 diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index 0093ab133..9dc99a0a1 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName= -Pkg.Revision=2 +Pkg.Revision=3 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=15 |