Commit Graph

556 Commits

Author SHA1 Message Date
Luca Stefani
a7b6b03d27 Add support for prop overrides
The format of the overrides is KEY=VALUE
Where KEY is one of the dict keys used in config
https://cs.android.com/android/platform/superproject/main/+/main:build/soong/scripts/gen_build_prop.py
And VALUE is the value you want take over.

An example:
PRODUCT_BUILD_PROP_OVERRIDES += \
    BuildDesc="jfltevzw-user 4.2.2 JDQ39 I545VRUAMDK release-keys" \
    BuildFingerprint=Verizon/jfltevzw/jfltevzw:4.2.2/JDQ39/I545VRUAMDK:user/release-keys \
    DeviceName=jfltevzw \
    DeviceProduct=jfltevzw \
    SystemDevice=jfltevzw \
    SystemName=jfltevzw

Change-Id: Ib44a3bb573d08d492acc092e104cb4f687f3b168
2025-02-18 13:24:05 +08:00
beanstown106
0754262ae7 soong: Show only Build ID in "Build number" section
(Former Change-Id: Ibf29628c622cab05597a5ca8cfd265534d303f8c)
Change-Id: I3e4f83d7ca5f0ac3b2036c5ef363c09ad565fcd1
Signed-off-by: Hridaya Prajapati <hridaya@pixelos.net>
2025-02-11 22:38:24 +08:00
Ido Ben-Hur
107888e09e soong: Hardcode release-keys instead of dev-keys
- We sign inline.

Change-Id: Idfac2f3a48973a3068da48f04724d5fa4ee5e934
Signed-off-by: Cyber Knight <cyberknight755@gmail.com>
2025-02-11 22:38:07 +08:00
Michael Bestas
742736d955 Conditionally use Unix epoch time for build incremental
Incremental version is used in various places to invalidate caches.
Setting BUILD_NUMBER directly causes unnecessary rebuilds due to
environment variable changes, so simply set it to Unix epoch unless
BUILD_NUMBER is explicitly set.

Change-Id: Id590df48ae1b73b63039f185644103d66a4bbbb3
2025-02-11 22:37:11 +08:00
SkyMinus
6743f96dcb gen_build_prop: Set ro.minus.device
Change-Id: I485d74642b869d7ac94ef2fd171cafd759965d41
(cherry picked from commit 03a92d7ad592feb7069859ab7a860ac0fb0f94a3)
2025-02-11 22:35:39 +08:00
Michael Bestas
8768f3afc1 gen_build_prop: Set ro.minui.default_touch_rotation
Change-Id: I18745292fadb8a8ff37d94e5603256997a3c1036
2025-02-11 22:32:44 +08:00
Michael Bestas
8bc24ce26b gen_build_prop: Set ro.build.fingerprint
Change-Id: I0e40b6f8154f8bc9a7b8450ecb4af4c44ab3d46d
2025-02-11 22:32:35 +08:00
LuK1337
d70492f14f check_boot_jars: Add nvidia packages to whitelist
Change-Id: I9958189f8baec057f65da692dd060682726125b4
2025-02-11 22:23:36 +08:00
Michael Bestas
35c53b6639 check_boot_jars: Add IFAA Manager to whitelist
Fixes:
Error: out/target/common/obj/JAVA_LIBRARIES/org.ifaa.android.manager_intermediates/classes.jar
  contains class file org/ifaa/android/manager/IFAAManager.class,
  whose package name org.ifaa.android.manager is not in the whitelist
  build/make/core/tasks/check_boot_jars/package_whitelist.txt
  of packages allowed on the bootclasspath.

(The error only pops up when using "make dist")

Change-Id: Ib17b935ca39de7f6e8e6b68aa81fbebe1d5a30a5
2025-02-11 22:23:36 +08:00
Scott Lobdell
cff7f54fef Add qcom.fmradio and org.codeaurora.internal to allowlist
B58: Add org.codeaurora.ims to the list.

Bug: 192690464
Change-Id: I0837873f5bf4e3a8402d70e720d2b55ee4e0a991
(cherry picked from commit ef25c8777180f88650dad8bd2499e8c8c9d174b7)
2025-02-11 22:23:36 +08:00
Treehugger Robot
ad6a20f3a1 Merge "Add links to partner docs for presigned apks" into main 2024-09-13 21:16:42 +00:00
Cole Faust
ce6ddd6e24 Add links to partner docs for presigned apks
So if a partner gets this error they can find the script and see
links to documentation.

Test: Presubmits
Change-Id: I50cbe4770e9619fb67a7a586fa6d2210c67d4650
2024-09-13 11:51:02 -07:00
Colin Cross
e1ab849b39 Support multiple <application> or <uses-sdk> elements in manifest_*.py
Manifests may now have multiple copies of elements if they are
disambiguated with android:featureFlag attributes.  Remove the
restrictions on duplicate elements from manifest_check.py and
manifest_fixer.py, and instead iterate over all matching elements.

Test: manifest_check_test.py, manifest_fixer_test.py
Bug: 365170653
Flag: EXEMPT bugfix
Change-Id: Ib577439d03a808a20a5fcc3e15a3117e0970d729
2024-09-13 11:20:21 -07:00
Colin Cross
6cb462b38c Fix manifest_fixer.py warnings
Fix a few warnings showing up in manifest_*.py

Test: manifest_fixer_test.py
Test: manifest_check_test.py
Flag: EXEMPT refactor
Change-Id: I144100d6d4aa7f5dff7eec79b4bd2d9d5da52153
2024-09-11 14:22:34 -07:00
Treehugger Robot
5c9c275d6e Merge "Build product/odm build.prop with Soong" into main am: 6f4d57a790
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3213179

Change-Id: I4f480134015a513ea5378a8a5bf92e440d33f41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 00:36:42 +00:00
Treehugger Robot
6f4d57a790 Merge "Build product/odm build.prop with Soong" into main 2024-08-12 00:08:32 +00:00
Colin Cross
5866fc2d42 Merge changes Ib238a83a,I9ed6a649 into main am: 82201c2db1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3212336

Change-Id: I3499299e5069555bb3b7df1fcd712fc4aea7e3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-08 18:26:02 +00:00
Inseob Kim
01d4f8b823 Build product/odm build.prop with Soong
Bug: 322090587
Test: compare build.prop before and after, boot
Change-Id: I7a7dc785030a0c17e5c09b7f65c978fe9bbcb7a7
2024-08-08 18:13:08 +09:00
Colin Cross
1f75cdf980 Use rsp for kotlin classpath
Support long classpaths by passing the classpath in a file to the script
that generates build.xml.

Bug: 308016794
Test: builds
Flag: EXEMPT refactor
Change-Id: Ib238a83a26acba7ede8e55298397dbeb9a57a866
2024-08-07 14:11:43 -07:00
Treehugger Robot
59f0d23ff6 Merge "Add system_ext support to build_prop module" into main am: 32b8daff1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3204632

Change-Id: I1f401c480670cd8ddacd351fc5ea5fb8f01fc6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:58 +00:00
Inseob Kim
acf9174120 Add system_ext support to build_prop module
As some partitions have build.prop under etc/, this change adds
relative_install_path property to build_prop module. Also this change
adds system_ext related Soong variables and system_ext support in
gen_build_prop.py.

Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I416662b8bae09383af0cdd3d8444a5c300006b7b
2024-08-05 12:51:05 +09:00
Inseob Kim
e3a9c50b34 Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main am: 81e60c9c0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201032

Change-Id: I0eaf12f8c85663a2b579597baf203d3e396f84ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:22 +00:00
Inseob Kim
24b560ec10 Revert^6 "Sync gen_build_prop.py to sysprop.mk" am: 2887482f0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200731

Change-Id: I1d09321490301aa44e31cbcbe3c458a2284bf3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:19 +00:00
Inseob Kim
a1e8c1c4d5 Merge "Fix build thumbprint in gen_build_prop.py" into main am: 9e51973c13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200730

Change-Id: Ibe23fca0f03f72e5595b0adb83efdc5105dadfe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:05 +00:00
Inseob Kim
81e60c9c0b Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main
* changes:
  Revert^6 "Use Soong-built system/build.prop"
  Revert^6 "Sync gen_build_prop.py to sysprop.mk"
  Revert^2 "Conditionally pass kernel version to build.prop"
  Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert "Revert "Revert^2 "Set output for build_prop even on Soon..."
2024-08-01 00:02:58 +00:00
Inseob Kim
bc4ef22b9b Revert^6 "Use Soong-built system/build.prop"
d5a12721b5

Change-Id: I6f4bf3043e73763b047bec3303f1547ec647d12b
2024-07-31 02:18:22 +00:00
Inseob Kim
2887482f0f Revert^6 "Sync gen_build_prop.py to sysprop.mk"
This reverts commit 7b7593968b.

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Change-Id: I83a4cb1a39bce1a1da8fabd49c6c895862a6c686
2024-07-31 02:18:07 +00:00
Liana Kazanova
2ec3713027 Revert^5 "Sync gen_build_prop.py to sysprop.mk" am: 7b7593968b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200272

Change-Id: I33410fba4da2ad83112df07c62680b7e01ad6f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:05 +00:00
Liana Kazanova
712d73fe87 Revert^5 "Use Soong-built system/build.prop" am: d5a12721b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200271

Change-Id: I442c9150aa04915c89b0ad6c1860cffc1663931a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:01 +00:00
Liana Kazanova
7b7593968b Revert^5 "Sync gen_build_prop.py to sysprop.mk"
2c7e13ea37

Change-Id: Ic1fd9ec4d65b657fb80a3849539e286934111d3c
2024-07-30 23:23:28 +00:00
Liana Kazanova
d5a12721b5 Revert^5 "Use Soong-built system/build.prop"
45ed4c2f9c

Change-Id: I574f29539d58239cd3f0e1ba6ae86e1b5d0f55ea
2024-07-30 23:22:51 +00:00
Inseob Kim
60f2636903 Fix build thumbprint in gen_build_prop.py
Bug: 356297315
Test: TH and ABTD
Change-Id: I28bccbbafbf9bcdf45a58361e37435b8d74d7464
2024-07-31 08:00:34 +09:00
Inseob Kim
65ed800943 Revert^4 "Use Soong-built system/build.prop" am: 45ed4c2f9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195649

Change-Id: I6e89b25d080279d13ffa5411331f05535cc60197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 04:13:50 +00:00
Inseob Kim
78f8f7682c Revert^4 "Sync gen_build_prop.py to sysprop.mk" am: 2c7e13ea37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195648

Change-Id: Ibf2b273532365e26645fff22afab7d4b55ea85bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 04:13:46 +00:00
Inseob Kim
e1234e51b8 Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main
* changes:
  Conditionally pass kernel version to build.prop
  Revert^4 "Use Soong-built system/build.prop"
  Revert^4 "Sync gen_build_prop.py to sysprop.mk"
  Revert^4 "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert^2 "Set output for build_prop even on Soong only build"
2024-07-30 03:51:03 +00:00
Treehugger Robot
2cd13acd05 Merge changes from topic "fix-presigned-apk-validation" into main am: 38f97d7a08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3194336

Change-Id: Ic8bd8e7201aad8099924856bc9341e1c6874e29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 21:39:39 +00:00
Rashid Zaman
3bd28705f4 Fix presigned apk check for privileged apps
The validation checks that run for presigned apps currently expect that
privileged apps have uncompressed dex files but if
DONT_UNCOMPRESS_PRIV_APPS_DEXS is true (UncompressPrivAppDex false) this
doesn't have to be the case so make the validation consistent with this.
Also make TestAndroidAppImport_Preprocessed verify that extra arguments
to 'check_prebuilt_presigned_apk.py' are correct for both privileged and
non-privileged apps.

Test: m nothing --no-skip-soong-tests
Test: Add presigned, privileged android_app_import module with
compressed dex to PRODUCT_PACKAGES for aosp_cf_x86_64_phone,
lunch aosp_cf_x86_64_phone-trunk_staging-userdebug &&
m DONT_UNCOMPRESS_PRIV_APPS_DEXS=true no longer fails due to validation
error.

Change-Id: I7e22cf525cd9d99d1ecb24e4e2e99c3f9de48146
2024-07-25 12:04:26 -07:00
Inseob Kim
45ed4c2f9c Revert^4 "Use Soong-built system/build.prop"
ea04e564c2

Change-Id: I621be841ba5715479e321537866f8b3a880da397
2024-07-25 10:58:08 +00:00
Inseob Kim
2c7e13ea37 Revert^4 "Sync gen_build_prop.py to sysprop.mk"
c13856eb1d

Change-Id: I4af6737c9d96821b524e34f271e92b610430a8d4
2024-07-25 10:58:08 +00:00
Pechetty Sravani (xWF)
b79a1309c2 Revert^3 "Sync gen_build_prop.py to sysprop.mk" am: c13856eb1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195812

Change-Id: Ib29b211c5a0a25d14cfd0b8a5badf75393261b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 10:38:58 +00:00
Pechetty Sravani (xWF)
120c27b42f Revert^3 "Use Soong-built system/build.prop" am: ea04e564c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195811

Change-Id: Ia14a373a48fa516bdf2ab3a6913b55547444d2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 10:38:52 +00:00
Pechetty Sravani (xWF)
c13856eb1d Revert^3 "Sync gen_build_prop.py to sysprop.mk"
e176dc9ee2

Change-Id: I8cf265281ff16ad65d1fe8d6084a6fd49adc294c
2024-07-25 09:21:09 +00:00
Pechetty Sravani (xWF)
ea04e564c2 Revert^3 "Use Soong-built system/build.prop"
625f66136d

Change-Id: I69b09646fb3286dcc5df638f87625f4eb8dcfcb2
2024-07-25 09:21:09 +00:00
Inseob Kim
bbd5c54b90 Revert^2 "Use Soong-built system/build.prop" am: 625f66136d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195640

Change-Id: Ib16ebbc28c5f72eeb7656d36f66234f9c3255ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:34 +00:00
Inseob Kim
cfff67661b Revert^2 "Sync gen_build_prop.py to sysprop.mk" am: e176dc9ee2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195639

Change-Id: Ifb8346ca2349867682cbc15296c9a1be3c0a6bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:31 +00:00
Inseob Kim
625f66136d Revert^2 "Use Soong-built system/build.prop"
3ef9ed9848

Change-Id: I132ea8c2feabedc8b5e9bb8c0adb8f0995b9a2ec
2024-07-25 03:27:49 +00:00
Inseob Kim
e176dc9ee2 Revert^2 "Sync gen_build_prop.py to sysprop.mk"
0e7cde59c8

Change-Id: If8b60802c8bdc62689d8939d5efa9007ad814d85
2024-07-25 03:27:49 +00:00
Inseob Kim
292ca45e77 Revert "Sync gen_build_prop.py to sysprop.mk" am: 0e7cde59c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195632

Change-Id: I83413277abf2f05cc97945a9a9500853bb1c226a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:15 +00:00
Inseob Kim
9eb39ab871 Revert "Use Soong-built system/build.prop" am: 3ef9ed9848
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195631

Change-Id: Ie208d91a5d27007bf6eafa9833c8cbbc1c4ccc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:10 +00:00
Inseob Kim
0e7cde59c8 Revert "Sync gen_build_prop.py to sysprop.mk"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: I833aacf23bbe7cd16b6aad0b7d94a9b46a8192e4
2024-07-25 02:45:53 +00:00