Add a soong namespace in device/generic/goldfish
Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I8e31f09ac823e242f3435fcc720e2d737f05b2f0
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..bbab688
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+soong_namespace {
+ imports: [
+ "device/generic/goldfish-opengl",
+ ],
+}
diff --git a/fvp.mk b/fvp.mk
index 0f4e602..2f7b36f 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -41,6 +41,8 @@
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-service \
android.hardware.audio@4.0-impl:32 \
diff --git a/vendor.mk b/vendor.mk
index e0ffe02..57fa76f 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -18,6 +18,10 @@
#
$(call inherit-product-if-exists, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
+PRODUCT_SOONG_NAMESPACES += \
+ device/generic/goldfish \
+ device/generic/goldfish-opengl
+
PRODUCT_SYSTEM_EXT_PROPERTIES += ro.lockscreen.disable.default=1
DISABLE_RILD_OEM_HOOK := true
