Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6ca9f5f authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android (Google) Code Review
Browse files

Merge "Revert^3 "Include Wear flags in xTS and Robolectric targets"" into main

parents 0492c5be 4f372389

target/product/aosp_arm64.mk

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ $(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

#

target/product/aosp_arm64_plus_armv7.mk

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ $(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

#

target/product/aosp_x86_64.mk

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ $(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

#

target/product/wear_extensions.mk

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#

# 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