tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master

Browse source
This commit is contained in:
Xin Li 2020-12-03 03:18:56 +00:00 committed by Android (Google) Code Review
commit 9c6c0302ab
8 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Makefile
View file

@ -5040,7 +5040,7 @@ ifeq (true,$(CLANG_COVERAGE))
$(PROFDATA_ZIP): $(SOONG_ZIP)
$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX)
$(call dist-for-goals,droidcore apps_only,$(PROFDATA_ZIP))
$(call dist-for-goals,droidcore,$(PROFDATA_ZIP))
endif
# -----------------------------------------------------------------

1
target/product/cfi-common.mk
View file

@ -19,7 +19,6 @@
PRODUCT_CFI_INCLUDE_PATHS := \
device/generic/goldfish/wifi/wpa_supplicant_8_lib \
device/google/cuttlefish/guest/libs/wpa_supplicant_8_lib \
device/google/wahoo/wifi_offload \
external/tinyxml2 \
external/wpa_supplicant_8 \
frameworks/av/camera \

3
target/product/generic_system.mk
View file

@ -121,9 +121,6 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
PRODUCT_ENFORCE_RRO_TARGETS := *
# TODO(b/150820813) Settings depends on static overlay, remove this after eliminating the dependency.
PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS := Settings
PRODUCT_NAME := generic_system
PRODUCT_BRAND := generic

3
target/product/generic_system_arm64.mk
View file

@ -38,9 +38,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false
PRODUCT_SHIPPING_API_LEVEL := 29
# TODO(b/137033385): change this back to "all"
PRODUCT_RESTRICT_VENDOR_FILES := owner
PRODUCT_NAME := generic_system_arm64
PRODUCT_DEVICE := mainline_arm64
PRODUCT_BRAND := generic

3
target/product/generic_system_x86.mk
View file

@ -37,9 +37,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false
PRODUCT_SHIPPING_API_LEVEL := 29
# TODO(b/137033385): change this back to "all"
PRODUCT_RESTRICT_VENDOR_FILES := owner
PRODUCT_NAME := generic_system_x86
PRODUCT_DEVICE := mainline_x86
PRODUCT_BRAND := generic

2
target/product/generic_system_x86_64.mk
View file

@ -38,8 +38,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false
PRODUCT_SHIPPING_API_LEVEL := 29
PRODUCT_RESTRICT_VENDOR_FILES := all
PRODUCT_NAME := generic_system_x86_64
PRODUCT_DEVICE := mainline_x86_64
PRODUCT_BRAND := generic

3
target/product/generic_system_x86_arm.mk
View file

@ -37,9 +37,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false
PRODUCT_SHIPPING_API_LEVEL := 29
# TODO(b/137033385): change this back to "all"
PRODUCT_RESTRICT_VENDOR_FILES := owner
PRODUCT_NAME := generic_system_x86_arm
PRODUCT_DEVICE := mainline_x86_arm
PRODUCT_BRAND := generic

1
target/product/media_system.mk
View file

@ -58,7 +58,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \
# The values should be of the format <apex name>:<jar name>
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
com.android.permission:service-permission \
com.android.wifi:service-wifi \
com.android.ipsec:android.net.ipsec.ike \
PRODUCT_COPY_FILES += \