p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Anton Hansson 2021-04-15 14:41:15 +01:00
parent e118347e56
commit 708b854c4a
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/module_arm.mk
View File

@ -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

4
target/product/module_arm64.mk
View File

@ -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

3
target/product/module_x86.mk
View File

@ -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

4
target/product/module_x86_64.mk
View File

@ -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