diff options
| author | Anton Hansson <hansson@google.com> | 2021-04-15 14:41:15 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-19 22:25:55 +0000 |
| commit | 2a8b71a7990b3ef77a48f2bdd4308c235aabf0b6 (patch) | |
| tree | a250fc7422c9b72776af99eaf1ee98f753310c6c | |
| parent | d5240009080c88d499e15d9915fd1f802bf0697c (diff) | |
| download | build-2a8b71a7990b3ef77a48f2bdd4308c235aabf0b6.tar.gz | |
Make module_* inherit aosp_*
This reverts a previous effort to build modules without the large number
of config flags in aosp_*, as it caused unintentional diffs and test
failures.
Bug: 184018787
Test: build and install com.android.media.swcodec && adb reboot &&
wait-for-boot && atest \
android.provider.cts.media.MediaStore_Video_ThumbnailsTest#testInsertUpdateDelete
Change-Id: I357624136e3e5427ab8077649a699e7f4a2e299e
(cherry picked from commit 708b854c4a333b92bd41023d7d92fafcd16ab8f2)
| -rw-r--r-- | target/product/module_arm.mk | 3 | ||||
| -rw-r--r-- | target/product/module_arm64.mk | 4 | ||||
| -rw-r--r-- | target/product/module_x86.mk | 3 | ||||
| -rw-r--r-- | target/product/module_x86_64.mk | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk index d99dce8b2b..0deb43df93 100644 --- a/target/product/module_arm.mk +++ b/target/product/module_arm.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk) PRODUCT_NAME := module_arm PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_arm diff --git a/target/product/module_arm64.mk b/target/product/module_arm64.mk index fc9529ce39..8effa785a9 100644 --- a/target/product/module_arm64.mk +++ b/target/product/module_arm64.mk @@ -14,9 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk) PRODUCT_NAME := module_arm64 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_arm64 diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk index b852e7a6de..5f75c82b55 100644 --- a/target/product/module_x86.mk +++ b/target/product/module_x86.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) PRODUCT_NAME := module_x86 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_x86 diff --git a/target/product/module_x86_64.mk b/target/product/module_x86_64.mk index f6bc1fc307..9196cd2503 100644 --- a/target/product/module_x86_64.mk +++ b/target/product/module_x86_64.mk @@ -14,9 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) PRODUCT_NAME := module_x86_64 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_x86_64 |