diff --git a/Patches/LineageOS-20.0/android_cts/1428dc7.patch b/Patches/LineageOS-20.0/android_cts/1428dc7.patch new file mode 100644 index 00000000..f91f1ad2 --- /dev/null +++ b/Patches/LineageOS-20.0/android_cts/1428dc7.patch @@ -0,0 +1,30 @@ +From 1428dc76adbbe06b8dc02af4f29422783388457e Mon Sep 17 00:00:00 2001 +From: kumarashishg +Date: Wed, 28 Jun 2023 07:15:27 +0000 +Subject: [PATCH] Change open jpeg folder name + +Replace libopenjpeg20 to libopenjpeg as folder name got updated in the +pdfium library + +Bug: 279055389 +Test: Build the code and flash the device and check Print functionality +(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4a4e992e9f3af9ea5dc71d725abb599dadbdd5e1) +Merged-In: I5b3d5740128f6ecc23dd8f9446a4f40c8550fd88 +Change-Id: I5b3d5740128f6ecc23dd8f9446a4f40c8550fd88 +--- + +diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp +index 382d629..aa676df 100644 +--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp ++++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp +@@ -30,8 +30,9 @@ + ], + static_libs: [ + "libpdfium-libopenjpeg2", ++ "libpdfium-fxcrt", + ], + include_dirs: [ +- "external/pdfium/third_party/libopenjpeg20", ++ "external/pdfium/third_party/libopenjpeg", + ], + } diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index c9d4ced4..784bad13 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -97,6 +97,7 @@ applyPatch "$DOS_PATCHES/android_build/0004-Selective_APEX.patch"; #Only enable sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_util.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig +sed -i 's/2023-11-05/2023-12-05/' core/version_defaults.mk; #Bump Security String #Q_asb_2023-11 #XXX #T_asb_2023-12 fi; if enterAndClear "build/soong"; then @@ -105,7 +106,7 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_buil fi; if enterAndClear "cts"; then -git fetch https://github.com/LineageOS/android_cts refs/changes/07/376307/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-12 +applyPatch "$DOS_PATCHES/android_cts/1428dc7.patch"; #T_asb_2023-12 fi; if enterAndClear "external/chromium-webview"; then