aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2018-06-14 23:08:47 (GMT)
committerHyunyoung Song <hyunyoungs@google.com>2018-06-14 23:15:23 (GMT)
commit16e7004e3fc05ecb829e74e19bee4c1bf66c5316 (patch)
treebac77b1f80ebdda34fab3f74bcb26ac37c14a264 /target
parent80ca83c41f4f2def5a9e01513a7cd8759c6a8438 (diff)
downloadandroid_build-16e7004e3fc05ecb829e74e19bee4c1bf66c5316.zip
android_build-16e7004e3fc05ecb829e74e19bee4c1bf66c5316.tar.gz
android_build-16e7004e3fc05ecb829e74e19bee4c1bf66c5316.tar.bz2
Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361 Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
Diffstat (limited to 'target')
-rw-r--r--target/product/aosp_arm.mk2
-rw-r--r--target/product/aosp_arm64.mk2
-rw-r--r--target/product/aosp_x86.mk2
-rw-r--r--target/product/aosp_x86_64.mk2
-rw-r--r--target/product/emulator.mk2
5 files changed, 5 insertions, 5 deletions
diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk
index 4b94b7e..b872f48 100644
--- a/target/product/aosp_arm.mk
+++ b/target/product/aosp_arm.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-include device/generic/goldfish/arm32-vendor.mk
+-include device/generic/goldfish/arm32-vendor.mk
# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
PRODUCT_PACKAGES += \
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
index 4b566f0..33defe1 100644
--- a/target/product/aosp_arm64.mk
+++ b/target/product/aosp_arm64.mk
@@ -19,7 +19,7 @@
# build quite specifically for the emulator, and might not be
# entirely appropriate to inherit from for on-device configurations.
-include device/generic/goldfish/arm64-vendor.mk
+-include device/generic/goldfish/arm64-vendor.mk
# Copy different zygote settings for vendor.img to select by setting property
# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:
diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk
index bfc7e38..9ba9523 100644
--- a/target/product/aosp_x86.mk
+++ b/target/product/aosp_x86.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-include device/generic/goldfish/x86-vendor.mk
+-include device/generic/goldfish/x86-vendor.mk
# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
PRODUCT_PACKAGES += \
diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk
index a810368..7afc782 100644
--- a/target/product/aosp_x86_64.mk
+++ b/target/product/aosp_x86_64.mk
@@ -19,7 +19,7 @@
# build quite specifically for the emulator, and might not be
# entirely appropriate to inherit from for on-device configurations.
-include device/generic/goldfish/x86_64-vendor.mk
+-include device/generic/goldfish/x86_64-vendor.mk
# Copy different zygote settings for vendor.img to select by setting property
# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 4d482fa..f6e1011 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -43,7 +43,7 @@ PRODUCT_CHARACTERISTICS := emulator
PRODUCT_FULL_TREBLE_OVERRIDE := true
# goldfish vendor partition configurations
-$(call inherit-product, device/generic/goldfish/vendor.mk)
+$(call inherit-product-if-exists, device/generic/goldfish/vendor.mk)
#watchdog tiggers reboot because location service is not
#responding, disble it for now.