diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-03 20:25:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-03 20:25:01 +0000 |
| commit | 8261de40ec8b9f4f289c9d37d7e45c2e1431b274 (patch) | |
| tree | 42294752250a2236175f40580eff10b5fe5f1f81 | |
| parent | f44380c60f3e7cbaffa954c0d9f610de09fd8dce (diff) | |
| parent | 90311be006bd81e38e4aafd5b09fce7afc645e95 (diff) | |
| download | goldfish-8261de40ec8b9f4f289c9d37d7e45c2e1431b274.tar.gz | |
Merge "tablet: use correct advancedFeatures.ini" into udc-dev am: 90311be006
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/24890747
Change-Id: I8fa726306fba1ebe9d2477ced08bd27b8be3bbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tasks/emu_img_zip.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tasks/emu_img_zip.mk b/tasks/emu_img_zip.mk index db239d8d..dc5e502a 100644 --- a/tasks/emu_img_zip.mk +++ b/tasks/emu_img_zip.mk @@ -49,15 +49,15 @@ ifneq ($(filter sdk_phone64_% sdk_gphone64_% sdk_tablet% sdk_gtablet%, $(TARGET_ INTERNAL_EMULATOR_FEATURE_DIR := 64bit endif -ifneq ($(filter %_tablet%, $(TARGET_PRODUCT)),) -ADVANCED_FEATURES_FILENAME := advancedFeatures.ini.tablet -endif - ADVANCED_FEATURES_FILENAME := advancedFeatures.ini ifneq ($(filter %_minigbm, $(TARGET_PRODUCT)),) ADVANCED_FEATURES_FILENAME := advancedFeatures.ini.minigbm endif +ifneq ($(filter sdk_tablet% sdk_gtablet%, $(TARGET_PRODUCT)),) +ADVANCED_FEATURES_FILENAME := advancedFeatures.ini.tablet +endif + ADVANCED_FEATURES_FILES := ifeq ($(TARGET_BUILD_VARIANT),user) ADVANCED_FEATURES_FILES += device/generic/goldfish/data/etc/google/$(INTERNAL_EMULATOR_FEATURE_DIR)/user/$(ADVANCED_FEATURES_FILENAME) |