diff options
| author | 2025-03-18 09:04:56 -0700 | |
|---|---|---|
| committer | 2025-03-19 18:14:43 -0700 | |
| commit | fb5fd465314cf7d94c66dee689c021c4f3b76ee8 (patch) | |
| tree | 0e13c992a28af9f4134ef54ea0138a4f358e6a77 | |
| parent | 3e2de79af1847e35a688c4402cd49ce042574544 (diff) | |
Revert^2 "Include Wear flags in xTS and Robolectric targets"
This reverts commit 948b9a462feba42f9b698170e2d86acc800f252f.
Reason for revert: This was reverted as a culprit, but it actually was not the real root cause of the test failure in b/404445325. Instead, it exposed an error in how the test was written, so the fix should test side.
Change-Id: I894cb0ee2bc5272e1efd8992137df59c3895d6f5
| -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 |