-
Notifications
You must be signed in to change notification settings - Fork 249
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moving master branch to android-15.0.0_r1
Upgrading master branch to Android 15 , this is the initial public push Tests done : Boot check pass Tracked-On: OAM-124205 Change-Id: I04029dae8f6857c62702089e9bd0602a9e53b5a5 Signed-off-by: Tanuj Tekriwal <[email protected]> Signed-off-by: Agarwal, Ankit <[email protected]>
- Loading branch information
1 parent
784d657
commit 809c8f7
Showing
285 changed files
with
139,374 additions
and
26,664 deletions.
There are no files selected for viewing
2,300 changes: 2,300 additions & 0 deletions
2,300
...iff/aaos_iasw/packages/services/Car/0002-enable-virtio-camera-based-evs-app-for-A15.patch
Large diffs are not rendered by default.
Oops, something went wrong.
68 changes: 68 additions & 0 deletions
68
aosp_diff/base_aaos/build/make/0001-Fix-for-missing-vendor-lib-modules-folder.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
From d32fd4baedc854115341ae1670cc0a5733971913 Mon Sep 17 00:00:00 2001 | ||
From: Ankit Agrawal <[email protected]> | ||
Date: Mon, 26 Aug 2024 12:47:02 +0530 | ||
Subject: [PATCH] Fix for missing vendor/lib/modules folder. | ||
|
||
It was looking file_list.txt file to get all the binaries list which | ||
should be part of vendor.img image. this list is not having lib/modules | ||
folder. | ||
|
||
Removing file_list.txt file lookup and creating vendor.img using all the | ||
binaries in vendor folder. | ||
|
||
Tests: EB is successful and able to see vendor/lib/modules folder in | ||
adb shell. | ||
|
||
Tracked-On: OAM-123896 | ||
Signed-off-by: Ankit Agrawal <[email protected]> | ||
--- | ||
core/Makefile | 13 ++++++------- | ||
1 file changed, 6 insertions(+), 7 deletions(-) | ||
|
||
diff --git a/core/Makefile b/core/Makefile | ||
index 6797a1d157..01b74d66de 100644 | ||
--- a/core/Makefile | ||
+++ b/core/Makefile | ||
@@ -3854,16 +3854,15 @@ define build-vendorimage-target | ||
$(call generate-image-prop-dictionary, $(vendorimage_intermediates)/vendor_image_info.txt,vendor,skip_fsck=true) | ||
PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \ | ||
$(BUILD_IMAGE) \ | ||
- $(if $(BUILD_BROKEN_INCORRECT_PARTITION_IMAGES),,--input-directory-filter-file $(vendorimage_intermediates)/file_list.txt) \ | ||
$(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt \ | ||
$(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT) | ||
$(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET) $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_VENDORIMAGE_PARTITION_SIZE)) | ||
endef | ||
|
||
-$(eval $(call write-partition-file-list,$(vendorimage_intermediates)/file_list.txt,$(TARGET_OUT_VENDOR),$(INTERNAL_VENDORIMAGE_FILES))) | ||
+#$(eval $(call write-partition-file-list,$(vendorimage_intermediates)/file_list.txt,$(TARGET_OUT_VENDOR),$(INTERNAL_VENDORIMAGE_FILES))) | ||
# Used by soong sandwich to request the staging dir be built | ||
-$(vendorimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_VENDOR)/%,$(INTERNAL_VENDORIMAGE_FILES)) | ||
- touch $@ | ||
+#$(vendorimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_VENDOR)/%,$(INTERNAL_VENDORIMAGE_FILES)) | ||
+# touch $@ | ||
|
||
# We just build this directly to the install location. | ||
INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET) | ||
@@ -3871,8 +3870,8 @@ $(INSTALLED_VENDORIMAGE_TARGET): \ | ||
$(INTERNAL_USERIMAGES_DEPS) \ | ||
$(INTERNAL_VENDORIMAGE_FILES) \ | ||
$(INSTALLED_FILES_FILE_VENDOR) \ | ||
- $(RECOVERY_FROM_BOOT_PATCH) \ | ||
- $(vendorimage_intermediates)/file_list.txt | ||
+ $(RECOVERY_FROM_BOOT_PATCH) | ||
+ # $(vendorimage_intermediates)/file_list.txt | ||
$(build-vendorimage-target) | ||
|
||
VENDOR_NOTICE_DEPS += $(INSTALLED_VENDORIMAGE_TARGET) | ||
@@ -3881,7 +3880,7 @@ $(call declare-container-license-metadata,$(INSTALLED_VENDORIMAGE_TARGET),legacy | ||
$(call declare-container-license-deps,$(INSTALLED_VENDORIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(RECOVERY_FROM_BOOT_PATH),$(PRODUCT_OUT)/:/) | ||
|
||
.PHONY: vendorimage-nodeps vnod | ||
-vendorimage-nodeps vnod: | $(INTERNAL_USERIMAGES_DEPS) $(vendorimage_intermediates)/file_list.txt | ||
+vendorimage-nodeps vnod: | $(INTERNAL_USERIMAGES_DEPS) | ||
$(build-vendorimage-target) | ||
|
||
.PHONY: sync_vendor | ||
-- | ||
2.34.1 | ||
|
Oops, something went wrong.