diff options
author | 2025-03-17 22:41:24 -0700 | |
---|---|---|
committer | 2025-03-17 22:41:24 -0700 | |
commit | d96871347ed92316c95a7b651854ce53cb76b09d (patch) | |
tree | 0010b4a4d3263f6b04d836317202fd54223853a1 | |
parent | d5cad165a091a2f0af3a8fda3ff9f9c3e2a25b98 (diff) | |
parent | 1439183c874f951292cae03d4375082eb05769bc (diff) |
Merge "Include Wear flags in xTS and Robolectric targets" into main
-rw-r--r-- | target/product/aosp_arm64.mk | 3 | ||||
-rw-r--r-- | target/product/aosp_arm64_plus_armv7.mk | 3 | ||||
-rw-r--r-- | target/product/aosp_x86_64.mk | 3 | ||||
-rw-r--r-- | target/product/wear_extensions.mk | 20 |
4 files changed, 29 insertions, 0 deletions
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index cd3de51bd8..384aec6edf 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -46,6 +46,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) # pKVM $(call inherit-product-if-exists, packages/modules/Virtualization/apex/product_packages.mk) +# Wear configs needed for proper execution of instrumentation tests (e.g. xTS tests) on Wear targets +$(call inherit-product, $(SRC_TARGET_DIR)/product/wear_extensions.mk) + # # All components inherited here go to product image # diff --git a/target/product/aosp_arm64_plus_armv7.mk b/target/product/aosp_arm64_plus_armv7.mk index 7322629ee5..afba2b13d4 100644 --- a/target/product/aosp_arm64_plus_armv7.mk +++ b/target/product/aosp_arm64_plus_armv7.mk @@ -35,6 +35,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) # pKVM $(call inherit-product-if-exists, packages/modules/Virtualization/apex/product_packages.mk) +# Wear configs needed for proper execution of instrumentation tests (e.g. xTS tests) on Wear targets +$(call inherit-product, $(SRC_TARGET_DIR)/product/wear_extensions.mk) + # # All components inherited here go to product image # diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index bd121e3712..8ff35a2f16 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -48,6 +48,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) # pKVM $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) +# Wear configs needed for proper execution of instrumentation tests (e.g. xTS tests) on Wear targets +$(call inherit-product, $(SRC_TARGET_DIR)/product/wear_extensions.mk) + # # All components inherited here go to product image # diff --git a/target/product/wear_extensions.mk b/target/product/wear_extensions.mk new file mode 100644 index 0000000000..2ac1d9d7dc --- /dev/null +++ b/target/product/wear_extensions.mk @@ -0,0 +1,20 @@ +# +# Copyright 2025 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. +# + +# Wear related configurations + +# Add Wear flags, if available. +PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/wear/release/release_config_map.textproto)
\ No newline at end of file |