Commit Graph

58 Commits

Author SHA1 Message Date
fazilsheik96 30db4767ca aospa: build: Generate json file with zip info after build
fix perm for json gen

Update generate_json_build_info.sh
2024-03-08 20:07:47 +05:30
Jake Weinstein 1092346f2d aospa: Update CLO merge script
- Fix --no-tags argument.
- Remove --no-clone-bundle.  Qualcomm no longer recommends
  this since migrating from CAF to CLO.
- Remove handling of separate CLO remotes since
  we now just have one: clo-la.

Change-Id: Ib9026a5850f658903e6e9717ecec347fc1cdd17f
2023-05-17 00:26:48 +09:00
Omkar Chandorkar 1d81649abf tools: clomerge: fix merging vendor tags which have verified QSSI revisions
Signed-off-by: Omkar Chandorkar <gotenksIN@aospa.co>
Change-Id: I7aed54dcd8a88a7f1a32a6de6e2a2f8aca770115
2022-10-17 15:05:00 +00:00
Jake Weinstein da2da59f2b scripts: Update merge script for CodeLinaro
Change-Id: I38b854cef537fcacf09720ab0dbb2f33f5aea218
2022-08-29 16:46:44 +00:00
Jyotiraditya Panda 08e999cd0a aospa: roomservice: Allow setting `clone-depth`.
Change-Id: I85272dc07bd2a3cbed81092265402550d977d7ec
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Signed-off-by: Juhyung Park <qkrwngud825@gmail.com>
2022-03-15 06:06:04 +00:00
Jyotiraditya Panda abde0ef1f8 roomservice: Add ability to resync missing repos
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Change-Id: Ib935168a31e229f580feb688a582f173d9f67072
2022-03-04 05:59:36 +00:00
Jyotiraditya Panda e3be7a5f94 roomservice: Give more details about repo addition.
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Change-Id: Iefd03226aaddc639f524a66796fb4497b400ec38
2022-03-04 05:59:16 +00:00
Akhil Narang da2a5ea68e
repopick: make -f|--force functional again
Change-Id: I6902ef1114462a147c465d7ae1f6511535380026
Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>
2022-03-03 17:21:18 +09:00
Giuseppe Maggio 3530b0e9a7
repopick: Add multiple topics support
Allow to pick multiple topics by appending them after
the relative parser argument.

Change-Id: I25666f23f879af8d9eb51703da4f35867698bb08
Signed-off-by: Josh Fox (XlxFoXxlX) <joshfox87@gmail.com>
2022-03-03 17:21:17 +09:00
Jyotiraditya Panda c5cad2189d
repopick: Add support for AOSP Gerrit
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Change-Id: Ie0d75254ab5ea106950f9c6d1532c7e9e5443614
2022-03-03 17:21:16 +09:00
Jyotiraditya Panda 9d40fa5764
repopick: Pretty print commit details.
Before:

Applying change number 20887...
--> Subject:       "SystemUI: Allow skipping main display cutout if device has UDC"
--> Project path:  frameworks/base
--> Change number: 20887 (Patch Set 5)
['git fetch aospa', u'refs/changes/87/20887/5']
From github.com:AOSPA/android_frameworks_base
 * branch                      refs/changes/87/20887/5 -> FETCH_HEAD

After:

Applying change number 20887...
--> Subject       : "SystemUI: Allow skipping main display cutout if device has UDC"
--> Project path  : frameworks/base
--> Change number : 20887 (Patch Set 5)
--> Command       : "git fetch aospa refs/changes/87/20887/5"
From github.com:AOSPA/android_frameworks_base
 * branch                      refs/changes/87/20887/5 -> FETCH_HEAD

Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co>
Change-Id: If16308c978d97dd2371e49c26c75e1467f0a4cc2
2022-03-03 17:21:15 +09:00
Vishalcj17 2402865737
build: Fix CAF merge script path.
Change-Id: Ie8874d0069b56e6e13f410021d39d67b626c9da4
2021-12-28 02:35:57 +09:00
OmniBot Auto Verifier d6adb53dfe
aospa: build: tools: repopick: Add a way to checkout instead of cherrypick
This helps if you want to take a commit and its dependencies, and not
just a particular commit

Change-Id: Ib245cce560c7b0d6fd03198a8c69a13d4720a4cb
2021-10-14 11:46:09 +09:00
Simon Shields e642bfac71
aospa: build: tools: repopick: fix --check-picked on Python 3
This is very subtly broken: we look for the string 'Change-Id:'
in an array of byte strings. Fix this by decoding the git output
to utf-8 strings.

Change-Id: I708ad0adacb61c89bfba0fd88eeb2e37648317af
2021-10-14 11:46:09 +09:00
Adrian DC 235d233dfd
aospa: build: tools: repopick: Support project paths detection on different branches
* When some projects are declared in the manifests with specific
    changes (revision="refs/changes/../....../."), the path
    detection does not work, while most cases have a unique paths

 * Allow projects with unique branches to select their paths
    upon repopick with a warning about the selection

Change-Id: Ic873d69f57c78f233db3d0de4ebd529f896799ea
2021-10-14 11:46:09 +09:00
LuK1337 e56ce7d5b4
aospa: build: tools: repopick: Print change subject as unicode
* This prevents from seeing stuff like
  "b'frameworks: Add unlinked ringtone and notification volumes'"
  when using python3 as default.

Change-Id: Ie1fa85681b648edcee65680d784da4dff1779616
2021-10-14 11:46:09 +09:00
Luca Weiss 9e0485422e
aospa: build: tools: repopick: cmp() is not available in Python 3, define it manually
Change-Id: I16a89aa555e62f105d888e87cb43afd26606076b
2021-10-14 11:46:08 +09:00
Vishalcj17 9f6d48721c
aospa: build: tools: Bring-in Repopick script from AOSPA.
Change-Id: I8eed4d9c039e4ced3b8bef2224140033ae330a80
2021-10-14 11:46:08 +09:00
Anay Wadhera 7305242bdf
aospa: build: Add a script to merge CAF.
Change-Id: I1d36d27be1bf476c951e04de75c9ea85b80af9ab
2021-10-14 11:46:07 +09:00
Vishalcj17 e1a96b9998
aospa: build: Kang roomservice from Lineage.
Change-Id: I174a92b1532e4d2f4e1a5373371839c8f89818a5
2021-10-14 11:46:07 +09:00
Vishalcj17 ab0d34ec12
aospa: Cleanup as much as possible.
* bravo six, going in for a restructure.

Change-Id: Ib787d9e52cbd97a797c62a0053a525756bc74b2c
2021-10-14 11:45:32 +09:00
Michael Bestas ed2943c58e
pa: build: Relocate extract utils to tools/extract-utils.
Change-Id: I13489b54298ebc2410c38ca9e16aa7121a28f997
2021-01-23 14:04:07 -07:00
Alexander Koskovich 7fd9b8bc79
pa: extract_utils: Fix prebuilt xmls copying out without .xml.
Change-Id: I7b1413e830ca907f0f63d19abef2ab2e0b14b1c4
2020-10-14 16:24:43 -07:00
Alexander Koskovich b089b1a08f
pa: build: tools: Change location of our tools.
Change-Id: Iecdfcfad35d6cae32bde4c380536c4a013157934
2020-09-25 18:14:26 -07:00
Alexander Koskovich d60ecc5f83
pa: extract_utils: Fix system_ext framework blueprint generation.
Change-Id: I20e44be6ea48b9bd5b05055d3cf465f63c908463
2020-09-18 09:19:53 -07:00
dianlujitao 3240724c83
pa: extract_utils: Disable ELF check for shared libraries.
* This is indeed a nice feature, but it's absolutely
   a bad idea to hardcode dependencies of prebuilt
   modules in proprietary-files.txt.

Change-Id: I8c2d75ff62c0c7862f40e777bcbad4d9cebc074c
2020-09-18 09:19:52 -07:00
Alexander Koskovich 5445a75517
pa: extract_utils: Add support for extracting APEX images.
* Also set the final package list at the end of type determination
   so it can run through the args and make any changes to the
   final list that it needs. For the APEX images I was having an
   issue where I renamed the pkgname depending on an arg present
   but the final list only recieved the name prior to the rename.

Change-Id: Ie5082cb1a426efbf1db26d32cbeb2cb5aef82156
2020-09-16 18:06:44 -07:00
Luca Stefani 537b960396
pa: extract_utils: Add support for system_ext.
Change-Id: I0760cdd9bec1a0a0551aa68a60c34f9c00932668
2020-09-16 18:06:44 -07:00
Andreas Schneider f7c597f5b7
pa: extract-utils: Fix usage for ETC files which need sub_dir.
* Thanks to Tad.

Change-Id: I6a0e7978afce6444d0827f97d7686f23aa7500c9
2020-09-16 18:06:44 -07:00
Andreas Schneider 05915b9851
pa: extract_utils: Fix vendor Android.bp creation with subdirectories.
error: vendor/samsung/beyond0lte/Android.bp:37:9: unrecognized property "sub_dir"

Change-Id: I23becda0345f41d2cb1462e74b66a787e9ad4c96
2020-09-16 18:06:44 -07:00
dianlujitao 20ef2008e4
pa: extract_utils: Handle Brotli compressed block image.
Change-Id: I1b3ef34ebba9b43fd684c6abaa1dbc77c8786da7
2020-09-16 18:06:43 -07:00
dianlujitao a7632dbd7b
pa: extract_utils: Support ODM/product/vendor partition for zip extract.
Change-Id: Iec06835f1703e276f8882c5ee327ef241a2f8f23
2020-09-16 18:06:43 -07:00
dianlujitao 6d30021388
pa: extract_utils: Generate deodexed APK/JAR with consistent checksum.
* Zip stores timestamp for all included files. The
   timestamps of dex files are different across different
   runs, result in inconsistent checksum of output APK/JAR.

 * Workaround the issue by using fixed timestamp for
   dex files.

Change-Id: I21f3a7e32cdfdb07c5f5c140df2e797efd4a8005
2020-09-16 18:06:43 -07:00
dianlujitao b681efb8fb
pa: extract_utils: Fix doubled path separator.
* $DST_FILE is already prefixed with "/", don't double it.

Change-Id: I2655313abd7720a54b20f541a95960ae9ec373ad
2020-09-16 18:06:43 -07:00
XiNGRZ ab58600e4a
pa: extract_utils: Fix bad substitution for ZSH.
Change-Id: I5f4fabc62b1ac3da159b36c3ae6080e145948530
2020-09-16 18:06:43 -07:00
TheStrix b261d672d1
pa: extract_utils: Add support for OVERRIDES argument.
- Used in our GApps.

Change-Id: I2504cbb760b20ed86c2dc088cc4bd74b78ba64d9
2020-09-16 18:06:42 -07:00
OmniBot Auto Verifier 9871e8aed7 repopick: Add a way to checkout instead of cherrypick
This helps if you want to take a commit and its dependencies, and not
just a particular commit

Change-Id: Ib245cce560c7b0d6fd03198a8c69a13d4720a4cb
2020-04-07 17:26:28 +00:00
TheStrix 38c9070fa7 extract_utils: Add support for extracting QTI common components
Change-Id: I4bc21d1c21f6e2b477360943ad063161b2e0cfad
2020-03-25 13:08:15 +05:30
Evan Anderson b3f12c6a5b roomservice: Fix recursion issue
* we need to append every element of the recursed manifest

Change-Id: Ia0c042b8e5da406a6210cf92564b45820a6dcbba
2020-03-05 00:15:45 -06:00
Evan Anderson 59af032333 roomservice: Fix inclusion of upstream manifests
Google updated the manifest format in the new version of repo to have the .repo/manifest.xml
file use an include of .repo/manifest/default.xml, instead of symlinking to default. This broke
roomservice because it didn't recurse far enough to pick up the manifests included in default.xml.
This change makes roomservice recurse the includes on every manifest to make sure it's built a
complete manifest before making decisions on what projects need removals

Change-Id: I410386574b9b267d2ce1f1d2ff8112baa4d02352
2020-03-04 22:50:30 -06:00
dianlujitao d6b690b0ef extract_utils: Drop string after semicolon when parsing destination
This fixes parsing when arguments contain colons, a typical usecase
would be:
-vendor/app/TimeService/TimeService.apk;:timeservice_app_cert

Change-Id: I7500ae09632632ddc10734d9b1df267e28286b67
2020-02-18 11:58:59 +00:00
Fabian Leutenegger 3d7394b492 extract_utils: We are Paranoid Android
Change-Id: I4aadc7f5d106c3ec425b2a76c917ca9196b415e1
2020-01-05 01:50:43 +00:00
Simon Shields 848d312e0d repopick: fix --check-picked on Python 3
This is very subtly broken: we look for the string 'Change-Id:'
in an array of byte strings. Fix this by decoding the git output
to utf-8 strings.

Change-Id: I708ad0adacb61c89bfba0fd88eeb2e37648317af
2019-12-19 16:13:34 +05:30
Adrian DC 48d45723ac repopick: Support project paths detection on different branches
* When some projects are declared in the manifests with specific
    changes (revision="refs/changes/../....../."), the path
    detection does not work, while most cases have a unique paths

 * Allow projects with unique branches to select their paths
    upon repopick with a warning about the selection

Change-Id: Ic873d69f57c78f233db3d0de4ebd529f896799ea
2019-12-19 16:13:28 +05:30
LuK1337 2b089ce898 repopick: Print change subject as unicode
* This prevents from seeing stuff like
  "b'frameworks: Add unlinked ringtone and notification volumes'"
  when using python3 as default.

Change-Id: Ie1fa85681b648edcee65680d784da4dff1779616
2019-12-19 16:13:05 +05:30
Mohd Faraz 97e8174437 extract_utils: Added Suffix uses COMMON_SUFFIX
* COMMON_JAVA_PACKAGE_SUFFIX for jar

 * COMMON_ANDROID_PACKAGE_SUFFIX for apk

Change-Id: I812405dac12ef7183985c66a6e43b0ea5f85989c
Signed-off-by: Mohd Faraz <mohd.faraz.abc@gmail.com>
2019-12-19 16:12:27 +05:30
Rashed Abdel-Tawab 10156c6231 extract_files: Implement blueprint file generation
Switch to blueprint on:
 - shared objects
 - $partiton/etc/ files
 - JARs
 - executable binaries and scripts
 - APKs

Only /sbin binaries are still in Android.mk because blueprint
doesn't handle sbin installation yet

Change-Id: I1dfd7e8bb575367b2a7fa9e333c4c6fa3aa68180
2019-12-19 16:12:18 +05:30
Rashed Abdel-Tawab 9e5b14d231 extract_files: Add initial blueprint creation
Start the copyrights for these at 2019 because the blueprints won't
have existed before then.

Change-Id: I5300109949785dd19555e35d17a1e80daef498b0
2019-12-19 16:11:56 +05:30
Rashed Abdel-Tawab 0603440e8e extract_files: Match non-treble path prefixes
Some devices put stuff on /system, /system/vendor or even
/system/vendor/odm. Search for these paths too when generating
TARGET_COPY_OUT_$partition variables.

Change-Id: Ie2c087e57aaca02d5ea93f290d5fc50d1315a600
2019-12-19 16:10:16 +05:30
Rashed Abdel-Tawab c03e5f6b82 extract_files: Support system/ prefixes
With support for 4 independent partitions now, we seriously
need to start putting /system blobs in their own directory.
Add support for file lists with system/ prefixes while
maintaining support for old file lists without it.

Also, TARGET_COPY_OUT_SYSTEM is a thing now, and all devices,
regardless of treble or not, set TARGET_COPY_OUT_$partition
so let's get rid of the treble compat option and default it
to true.

Change-Id: I5b798d293768d7c1e16db3ba01e2de3e083088d7
2019-12-19 16:10:09 +05:30