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

Commit 708b854c authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent e118347e

target/product/module_arm.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

target/product/module_arm64.mk

+1 −3
Original line number Diff line number Diff line
@@ -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

target/product/module_x86.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

target/product/module_x86_64.mk

+1 −3
Original line number Diff line number Diff line
@@ -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