Merge "Merge Coral/Flame into AOSP master"
This commit is contained in:
@@ -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)
|
||||||
|
@@ -3891,7 +3891,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 += \
|
||||||
|
@@ -18,4 +18,4 @@
|
|||||||
# (like "CRB01"). It must be a single word, and is
|
# (like "CRB01"). It must be a single word, and is
|
||||||
# capitalized by convention.
|
# capitalized by convention.
|
||||||
|
|
||||||
BUILD_ID=QT
|
BUILD_ID=QD1A.190821.011
|
||||||
|
@@ -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
|
||||||
|
@@ -124,8 +124,6 @@ PRODUCT_PACKAGES += \
|
|||||||
libbinder_ndk \
|
libbinder_ndk \
|
||||||
libc.bootstrap \
|
libc.bootstrap \
|
||||||
libcamera2ndk \
|
libcamera2ndk \
|
||||||
libcamera_client \
|
|
||||||
libcameraservice \
|
|
||||||
libcutils \
|
libcutils \
|
||||||
libdl.bootstrap \
|
libdl.bootstrap \
|
||||||
libdrmframework \
|
libdrmframework \
|
||||||
|
Reference in New Issue
Block a user