diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:53:31 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:53:31 +0000 |
commit | d7cad09425c55efa313560be59678562d992a35b (patch) | |
tree | 74fca80e686a63132e6fa1b1b90bfdd1d27f094a | |
parent | 219663201616f761692771560345ee93758ad941 (diff) | |
parent | 8aec0e51b93487f775a05f061d453365c95b42ae (diff) | |
download | build-d7cad09425c55efa313560be59678562d992a35b.tar.gz |
Snap for 7080740 from 8aec0e51b93487f775a05f061d453365c95b42ae to mainline-permission-release
Change-Id: Iaccfbe88127b43b07734f625a1ac6ed4beec6183
-rw-r--r-- | core/Makefile | 2 | ||||
-rw-r--r-- | core/dex_preopt_config.mk | 2 | ||||
-rw-r--r-- | core/rbe.mk | 2 | ||||
-rw-r--r-- | core/tasks/general-tests.mk | 2 | ||||
-rw-r--r-- | core/tasks/mts.mk | 21 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | rbesetup.sh | 37 | ||||
-rw-r--r-- | target/board/BoardConfigModuleCommon.mk | 6 | ||||
-rw-r--r-- | target/board/module_arm/BoardConfig.mk | 22 | ||||
-rw-r--r-- | target/board/module_arm/README.md | 2 | ||||
-rw-r--r-- | target/board/module_arm/device.mk | 18 | ||||
-rw-r--r-- | target/board/module_arm64/BoardConfig.mk | 27 | ||||
-rw-r--r-- | target/board/module_arm64/README.md | 3 | ||||
-rw-r--r-- | target/board/module_arm64/device.mk | 19 | ||||
-rw-r--r-- | target/board/module_x86/BoardConfig.mk | 20 | ||||
-rw-r--r-- | target/board/module_x86/README.md | 2 | ||||
-rw-r--r-- | target/board/module_x86/device.mk | 18 | ||||
-rw-r--r-- | target/board/module_x86_64/BoardConfig.mk | 24 | ||||
-rw-r--r-- | target/board/module_x86_64/README.md | 3 | ||||
-rw-r--r-- | target/board/module_x86_64/device.mk | 19 | ||||
-rw-r--r-- | target/product/base_system.mk | 33 | ||||
-rw-r--r-- | target/product/bootclasspath.mk | 48 |
22 files changed, 284 insertions, 48 deletions
diff --git a/core/Makefile b/core/Makefile index e81ee90aff..aa9f0e0482 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5087,7 +5087,7 @@ ifeq (true,$(EMMA_INSTRUMENT)) JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar $(JACOCO_REPORT_CLASSES_ALL) : @echo "Collecting uninstrumented classes" - find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" 2>/dev/null | sort > $@.list + find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" -o -name "proguard_usage.zip" 2>/dev/null | sort > $@.list $(SOONG_ZIP) -o $@ -L 0 -C $(OUT_DIR) -P out -l $@.list endif # EMMA_INSTRUMENT=true diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index ccf53f5229..c154f56bcf 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -1,7 +1,7 @@ DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config # The default value for LOCAL_DEX_PREOPT -DEX_PREOPT_DEFAULT ?= true +DEX_PREOPT_DEFAULT ?= $(ENABLE_PREOPT) # The default filter for which files go into the system_other image (if it is # being used). Note that each pattern p here matches both '/<p>' and /system/<p>'. diff --git a/core/rbe.mk b/core/rbe.mk index cfad09cf6e..040ac0b19d 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -57,7 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) java_r8_d8_platform := $(platform)",Pool=java16" RBE_WRAPPER := $(rbe_dir)/rewrapper - RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" --compare="$(cxx_compare)" + RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_allowlist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare) # Append rewrapper to existing *_WRAPPER variables so it's possible to # use both ccache and rewrapper. diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index cb84a5ca74..a820a28f25 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -14,12 +14,10 @@ .PHONY: general-tests -# TODO(b/149249068): Remove vts10-tradefed.jar after all VTS tests are converted general_tests_tools := \ $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests) general_tests_zip := $(PRODUCT_OUT)/general-tests.zip diff --git a/core/tasks/mts.mk b/core/tasks/mts.mk index e800505e56..e0848560d1 100644 --- a/core/tasks/mts.mk +++ b/core/tasks/mts.mk @@ -13,13 +13,20 @@ # limitations under the License. ifneq ($(wildcard test/mts/README.md),) -test_suite_name := mts -test_suite_tradefed := mts-tradefed -test_suite_readme := test/mts/README.md -include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk +mts_test_suites := +mts_test_suites += mts + +$(foreach module, $(mts_modules), $(eval mts_test_suites += mts-$(module))) + +$(foreach suite, $(mts_test_suites), \ + $(eval test_suite_name := $(suite)) \ + $(eval test_suite_tradefed := mts-tradefed) \ + $(eval test_suite_readme := test/mts/README.md) \ + $(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \ + $(eval .PHONY: $(suite)) \ + $(eval $(suite): $(compatibility_zip)) \ + $(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \ +) -.PHONY: mts -mts: $(compatibility_zip) -$(call dist-for-goals, mts, $(compatibility_zip)) endif diff --git a/core/version_defaults.mk b/core/version_defaults.mk index f96fca0ece..9c7ac2c8f5 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2020-11-01 + PLATFORM_SECURITY_PATCH := 2021-03-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/rbesetup.sh b/rbesetup.sh index 25a1703075..8f65b2924d 100644 --- a/rbesetup.sh +++ b/rbesetup.sh @@ -1,4 +1,31 @@ -source build/envsetup.sh +function _source_env_setup_script() { + local -r ENV_SETUP_SCRIPT="build/make/envsetup.sh" + local -r TOP_DIR=$( + while [[ ! -f "${ENV_SETUP_SCRIPT}" ]] && [[ "${PWD}" != "/" ]]; do + \cd .. + done + if [[ -f "${ENV_SETUP_SCRIPT}" ]]; then + echo "$(PWD= /bin/pwd -P)" + fi + ) + + local -r FULL_PATH_ENV_SETUP_SCRIPT="${TOP_DIR}/${ENV_SETUP_SCRIPT}" + if [[ ! -f "${FULL_PATH_ENV_SETUP_SCRIPT}" ]]; then + echo "ERROR: Unable to source ${ENV_SETUP_SCRIPT}" + return 1 + fi + + # Need to change directory to the repo root so vendor scripts can be sourced + # as well. + local -r CUR_DIR=$PWD + \cd "${TOP_DIR}" + source "${FULL_PATH_ENV_SETUP_SCRIPT}" + \cd "${CUR_DIR}" +} + +# This function needs to run first as the remaining defining functions may be +# using the envsetup.sh defined functions. +_source_env_setup_script || return # This function prefixes the given command with appropriate variables needed # for the build to be executed with RBE. @@ -28,7 +55,7 @@ function use_rbe() { # ANDROID_ENABLE_METRICS_UPLOAD. function _export_metrics_uploader() { local uploader_path="$(gettop)/vendor/google/misc/metrics_uploader_prebuilt/metrics_uploader.sh" - if [ -x "${uploader_path}" ]; then + if [[ -x "${uploader_path}" ]]; then export ANDROID_ENABLE_METRICS_UPLOAD="${uploader_path}" fi } @@ -37,7 +64,11 @@ function _export_metrics_uploader() { # executed by RBE. This file should be sourced once per checkout of Android code. function _set_rbe_vars() { export USE_RBE="true" - export RBE_CXX_EXEC_STRATEGY="remote_local_fallback" + export RBE_CXX_EXEC_STRATEGY="racing" + export RBE_JAVAC_EXEC_STRATEGY="racing" + export RBE_R8_EXEC_STRATEGY="racing" + export RBE_D8_EXEC_STRATEGY="racing" + export RBE_use_unified_cas_ops="true" export RBE_JAVAC=1 export RBE_R8=1 export RBE_D8=1 diff --git a/target/board/BoardConfigModuleCommon.mk b/target/board/BoardConfigModuleCommon.mk new file mode 100644 index 0000000000..24c01a58ef --- /dev/null +++ b/target/board/BoardConfigModuleCommon.mk @@ -0,0 +1,6 @@ +# BoardConfigModuleCommon.mk +# +# Common compile-time settings for module builds. + +# Required for all module devices. +TARGET_USES_64_BIT_BINDER := true diff --git a/target/board/module_arm/BoardConfig.mk b/target/board/module_arm/BoardConfig.mk new file mode 100644 index 0000000000..3f35c060e1 --- /dev/null +++ b/target/board/module_arm/BoardConfig.mk @@ -0,0 +1,22 @@ +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_ARCH := arm +TARGET_ARCH_VARIANT := armv7-a-neon +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := armeabi-v7a +TARGET_CPU_ABI2 := armeabi diff --git a/target/board/module_arm/README.md b/target/board/module_arm/README.md new file mode 100644 index 0000000000..b893573bd1 --- /dev/null +++ b/target/board/module_arm/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an arm +device. diff --git a/target/board/module_arm/device.mk b/target/board/module_arm/device.mk new file mode 100644 index 0000000000..7cac5f8430 --- /dev/null +++ b/target/board/module_arm/device.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_arm64/BoardConfig.mk b/target/board/module_arm64/BoardConfig.mk new file mode 100644 index 0000000000..3700056da3 --- /dev/null +++ b/target/board/module_arm64/BoardConfig.mk @@ -0,0 +1,27 @@ +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := arm64-v8a + +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv8-a +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi +TARGET_2ND_CPU_VARIANT := generic diff --git a/target/board/module_arm64/README.md b/target/board/module_arm64/README.md new file mode 100644 index 0000000000..cb36fbf258 --- /dev/null +++ b/target/board/module_arm64/README.md @@ -0,0 +1,3 @@ +This device is suitable for an unbundled module targeted specifically to an +arm64 device. 32 bit binaries built with this product will not be suitable for a +32-bit arm device. diff --git a/target/board/module_arm64/device.mk b/target/board/module_arm64/device.mk new file mode 100644 index 0000000000..9065d4b66d --- /dev/null +++ b/target/board/module_arm64/device.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/core_64_bit.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86/BoardConfig.mk b/target/board/module_x86/BoardConfig.mk new file mode 100644 index 0000000000..a93ac9779c --- /dev/null +++ b/target/board/module_x86/BoardConfig.mk @@ -0,0 +1,20 @@ +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_CPU_ABI := x86 +TARGET_ARCH := x86 +TARGET_ARCH_VARIANT := x86 diff --git a/target/board/module_x86/README.md b/target/board/module_x86/README.md new file mode 100644 index 0000000000..10866b7c5f --- /dev/null +++ b/target/board/module_x86/README.md @@ -0,0 +1,2 @@ +This device is suitable for an unbundled module targeted specifically to an +x86 device. diff --git a/target/board/module_x86/device.mk b/target/board/module_x86/device.mk new file mode 100644 index 0000000000..7cac5f8430 --- /dev/null +++ b/target/board/module_x86/device.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86_64/BoardConfig.mk b/target/board/module_x86_64/BoardConfig.mk new file mode 100644 index 0000000000..1ed3be0ba6 --- /dev/null +++ b/target/board/module_x86_64/BoardConfig.mk @@ -0,0 +1,24 @@ +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include build/make/target/board/BoardConfigModuleCommon.mk + +TARGET_CPU_ABI := x86_64 +TARGET_ARCH := x86_64 +TARGET_ARCH_VARIANT := x86_64 + +TARGET_2ND_CPU_ABI := x86 +TARGET_2ND_ARCH := x86 +TARGET_2ND_ARCH_VARIANT := x86_64 diff --git a/target/board/module_x86_64/README.md b/target/board/module_x86_64/README.md new file mode 100644 index 0000000000..3377baad2a --- /dev/null +++ b/target/board/module_x86_64/README.md @@ -0,0 +1,3 @@ +This device is suitable for an unbundled module targeted specifically to an +x86_64 device. 32 bit binaries built with this product will not be suitable for +a 32-bit x86 device. diff --git a/target/board/module_x86_64/device.mk b/target/board/module_x86_64/device.mk new file mode 100644 index 0000000000..9065d4b66d --- /dev/null +++ b/target/board/module_x86_64/device.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, build/make/target/product/bootclasspath.mk) +$(call inherit-product, build/make/target/product/core_64_bit.mk) +$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 4569bceff9..6fee023689 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -315,44 +315,12 @@ PRODUCT_HOST_PACKAGES += \ tz_version_host \ tz_version_host_tzdata_apex \ -ifeq ($(ART_APEX_JARS),) -$(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) -endif - -# The order matters for runtime class lookup performance. -PRODUCT_BOOT_JARS := \ - $(ART_APEX_JARS) \ - framework-minus-apex \ - ext \ - telephony-common \ - voip-common \ - ims-common - -PRODUCT_UPDATABLE_BOOT_JARS := \ - com.android.conscrypt:conscrypt \ - com.android.media:updatable-media \ - com.android.mediaprovider:framework-mediaprovider \ - com.android.os.statsd:framework-statsd \ - com.android.permission:framework-permission \ - com.android.sdkext:framework-sdkextensions \ - com.android.wifi:framework-wifi \ - com.android.tethering:framework-tethering PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \ system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \ system/core/rootdir/etc/hosts:system/etc/hosts -# Add the compatibility library that is needed when android.test.base -# is removed from the bootclasspath. -# Default to excluding android.test.base from the bootclasspath. -ifneq ($(REMOVE_ATB_FROM_BCP),false) -PRODUCT_PACKAGES += framework-atb-backward-compatibility -PRODUCT_BOOT_JARS += framework-atb-backward-compatibility -else -PRODUCT_BOOT_JARS += android.test.base -endif - PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 @@ -408,4 +376,5 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects) +$(call inherit-product, $(SRC_TARGET_DIR)/product/bootclasspath.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) diff --git a/target/product/bootclasspath.mk b/target/product/bootclasspath.mk new file mode 100644 index 0000000000..a06b3b3d63 --- /dev/null +++ b/target/product/bootclasspath.mk @@ -0,0 +1,48 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +ifeq ($(ART_APEX_JARS),) + $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) +endif + +# The order matters for runtime class lookup performance. +PRODUCT_BOOT_JARS := \ + $(ART_APEX_JARS) \ + framework-minus-apex \ + ext \ + telephony-common \ + voip-common \ + ims-common + +PRODUCT_UPDATABLE_BOOT_JARS := \ + com.android.conscrypt:conscrypt \ + com.android.media:updatable-media \ + com.android.mediaprovider:framework-mediaprovider \ + com.android.os.statsd:framework-statsd \ + com.android.permission:framework-permission \ + com.android.sdkext:framework-sdkextensions \ + com.android.wifi:framework-wifi \ + com.android.tethering:framework-tethering + +# Add the compatibility library that is needed when android.test.base +# is removed from the bootclasspath. +# Default to excluding android.test.base from the bootclasspath. +ifneq ($(REMOVE_ATB_FROM_BCP),false) + PRODUCT_PACKAGES += framework-atb-backward-compatibility + PRODUCT_BOOT_JARS += framework-atb-backward-compatibility +else + PRODUCT_BOOT_JARS += android.test.base +endif |