From ecf644f2d6b65e040d96b764e3a62649a3ec04fb Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Fri, 17 Jul 2020 10:45:11 -0700 Subject: Add Automotive OS API 29 stubs to platform SDK optionals. Android Automotive OS stubs (android.car-stubs.jar) is used to compile apps against Car API. NOTE: We tried using ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar, but it doesn't work because car-stubs are not generated when building regular Android SDK for phones. Bug: 154653660 Test: m -j Test: m -j dist Test: 1. $ ./build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_phone_armv7 \ TARGET_BUILD_VARIANT=userdebug win_sdk dist DIST_DIR=dist-mine sdk_repo 2. Copy and unzip dist-mine/android-sdk_eng.zhomart_windows.zip to $HOME/Android/Sdk (replaced the existing Sdk forlder) 3. Created a sample app, used "android.car.Car" and verified it compiles, runs and connects to the car service. Change-Id: I1913fd89cf1cd702b3b5b3f386cf3693a5042eea --- build/optional.json | 5 +++++ build/sdk.atree | 2 ++ 2 files changed, 7 insertions(+) diff --git a/build/optional.json b/build/optional.json index 4b3bedf9a..b63c165e8 100644 --- a/build/optional.json +++ b/build/optional.json @@ -4,6 +4,11 @@ "jar": "org.apache.http.legacy.jar", "manifest": false }, + { + "name": "android.car", + "jar": "android.car.jar", + "manifest": false + }, { "name": "android.test.mock", "jar": "android.test.mock.jar", diff --git a/build/sdk.atree b/build/sdk.atree index e42781704..25e1d6fea 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -172,6 +172,8 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-s # optional API files. development/build/optional.json platforms/${PLATFORM_NAME}/optional/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 +# Android Automotive OS stubs. +prebuilts/sdk/29/public/android.car.jar platforms/${PLATFORM_NAME}/optional/android.car.jar # deprecated APIs ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar # Test APIs -- cgit v1.2.3 From bdb2a60d3eb790cef147b4edd55173569f2c7699 Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Fri, 24 Jul 2020 15:24:50 -0700 Subject: Add generated Automotive OS SDK. - Update old comments in sdk.atree. - Add README.md with instructions on building sdk. Test: lunch sdk && m -j sdk Test: Unzipped and extracted platforms/android-11/optional/android.car.jar and verified it with the latest android.car-stubs.jar from http://ab/. Bug: 162442020 Change-Id: I9796fbcecfef5178915008b49d81cda996c66fa2 --- build/Android.mk | 3 +++ build/README.md | 11 +++++++++++ build/sdk.atree | 9 ++------- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 build/README.md 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/sdk.atree b/build/sdk.atree index 41b746a4b..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 @@ -170,10 +165,10 @@ ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-current-stubs-for-system-module # optional API files. development/build/optional.json platforms/${PLATFORM_NAME}/optional/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 -# Android Automotive OS stubs. -prebuilts/sdk/29/public/android.car.jar platforms/${PLATFORM_NAME}/optional/android.car.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 -- cgit v1.2.3 From 2d94bec03ad7103fcbf45d9922f3aed828b275bc Mon Sep 17 00:00:00 2001 From: Raju Kulkarni Date: Fri, 31 Jul 2020 18:16:02 +0000 Subject: Updating build-tools package revision number to ship a hot fix for b/162522383 Bug: 162522383 Test: N/A Change-Id: I4a467a0e9dd1817838d4aaf8cebf88903f826275 --- sdk/build_tools_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 56aa106e168f70a641b67d62f4c42490e19710f3 Mon Sep 17 00:00:00 2001 From: Raju Kulkarni Date: Fri, 31 Jul 2020 18:27:42 +0000 Subject: Bumping SDK Platform package version number for SDK re-release to include Automotive jars Bug: 162442020 Change-Id: I7a0a750e92d70130764a8d3fb098e48d44190cf0 Test: N/A --- sdk/platform_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3