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

Commit f6997372 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Coral/Flame into AOSP master"

parents 6b1be377 a76973dc

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)/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

$(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)

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3891,7 +3891,7 @@ INTERNAL_OTATOOLS_PACKAGE_FILES += \ 
ifneq (,$(wildcard device))

INTERNAL_OTATOOLS_PACKAGE_FILES += \

  $(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

ifneq (,$(wildcard external/avb))

INTERNAL_OTATOOLS_PACKAGE_FILES += \

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=QT
 
BUILD_ID=QD1A.190821.011

core/tasks/mts.mk

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



ifneq ($(wildcard test/mts/README.md),)

test_suite_name := mts

test_suite_tradefed := mts-tradefed

test_suite_readme := test/mts/README.md
@@ -21,3 +22,4 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk 
.PHONY: mts

mts: $(compatibility_zip)

$(call dist-for-goals, mts, $(compatibility_zip))

endif

target/product/base_system.mk

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ PRODUCT_PACKAGES += \ 
    libbinder_ndk \

    libc.bootstrap \

    libcamera2ndk \

    libcamera_client \

    libcameraservice \

    libcutils \

    libdl.bootstrap \

    libdrmframework \