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

Commit bf13cbbd authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: I50d1c3ff964b0863d53016c33b2ed4dec9f34f7d
Change-Id: I38ba784b68d865a429aca4f49780461d1df5b4c8
parents ff007a03 ed85cfa4

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 
gen/

.vscode/

*.code-workspace

.gradle/

AconfigFlags.bp

+652 −15

File changed.

Preview size limit exceeded, changes collapsed.

Android.bp

+36 −21

File changed.

Preview size limit exceeded, changes collapsed.

PREUPLOAD.cfg

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c 


hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/ktfmt_includes.txt ${PREUPLOAD_FILES}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



# This flag check hook runs only for "packages/SystemUI" subdirectory. If you want to include this check for other subdirectories, please modify flag_check.py.

flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

Ravenwood.bp

0 → 100644
+98 −0

File added.

Preview size limit exceeded, changes collapsed.