StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Browse Source 
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
This commit is contained in:
Xin Li
2019-09-08 13:11:47 -07:00
parent a0d2141f45 14c6434a11
commit abf6afdce6
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@@ -646,6 +646,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
# Remove libcameraservice and libcamera_client from base_system
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
# Move product and system_ext to root for emulators # Move product and system_ext to root for emulators
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/product) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/product)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext)

2
core/Makefile
View File

@@ -3688,7 +3688,7 @@ INTERNAL_OTATOOLS_PACKAGE_FILES += \
ifneq (,$(wildcard device)) ifneq (,$(wildcard device))
INTERNAL_OTATOOLS_PACKAGE_FILES += \ INTERNAL_OTATOOLS_PACKAGE_FILES += \
$(sort $(shell find device $(wildcard vendor) -type f -name "*.pk8" -o -name "verifiedboot*" -o \ $(sort $(shell find device $(wildcard vendor) -type f -name "*.pk8" -o -name "verifiedboot*" -o \
-name "*.x509.pem" -o -name "oem*.prop")) -name "*.pem" -o -name "oem*.prop" -o -name "*.avbpubkey"))
endif endif
ifneq (,$(wildcard external/avb)) ifneq (,$(wildcard external/avb))
INTERNAL_OTATOOLS_PACKAGE_FILES += \ INTERNAL_OTATOOLS_PACKAGE_FILES += \

2
core/tasks/mts.mk
View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
ifneq ($(wildcard test/mts/README.md),)
test_suite_name := mts test_suite_name := mts
test_suite_tradefed := mts-tradefed test_suite_tradefed := mts-tradefed
test_suite_readme := test/mts/README.md test_suite_readme := test/mts/README.md
@@ -21,3 +22,4 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
.PHONY: mts .PHONY: mts
mts: $(compatibility_zip) mts: $(compatibility_zip)
$(call dist-for-goals, mts, $(compatibility_zip)) $(call dist-for-goals, mts, $(compatibility_zip))
endif

2
core/version_defaults.mk
View File

@@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2019-09-05 PLATFORM_SECURITY_PATCH := 2019-10-05
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH .KATI_READONLY := PLATFORM_SECURITY_PATCH

2
target/product/base_system.mk
View File

@@ -129,8 +129,6 @@ PRODUCT_PACKAGES += \
libbinder_ndk \ libbinder_ndk \
libc.bootstrap \ libc.bootstrap \
libcamera2ndk \ libcamera2ndk \
libcamera_client \
libcameraservice \
libcutils \ libcutils \
libdl.bootstrap \ libdl.bootstrap \
libdrmframework \ libdrmframework \