ScoopDroid/android_build_soong
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
84447 commits 2 branches 0 tags 111 MiB
Commit graph

526 commits

Author SHA1 Message Date
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
d5a12721b5 Revert^5 "Use Soong-built system/build.prop" 
45ed4c2f9c

Change-Id: I574f29539d58239cd3f0e1ba6ae86e1b5d0f55ea
 2024-07-30 23:22:51 +00: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
Inseob Kim
3ef9ed9848 Revert "Use Soong-built system/build.prop" 
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: I1738cc0a85428d3fd0a0ee196fa6d54270e6f1ec
 2024-07-25 02:45:53 +00:00
Inseob Kim
82a7c593ab Merge changes from topic "system_build_prop_soong" into main am: b93b9f0b3a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3184480

Change-Id: Ic699f604f570870f26eef1f181074696624e0b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-25 02:08:27 +00:00
Inseob Kim
9eafa1a748 Sync gen_build_prop.py to sysprop.mk am: 19fd1316b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3184479

Change-Id: Id7cc4db5409e5ead7725c2901df04c3bfc45395a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-25 02:08:24 +00:00
Inseob Kim
361baadba6 Use Soong-built system/build.prop 
buildinfo.prop is also removed since it's now obsolete.

Bug: 322090587
Test: boot
Test: compare build.prop before and after
Change-Id: Ida7bab82add6e86e1076061a5fcdb572cedd1578
 2024-07-24 17:20:22 +09:00
Inseob Kim
19fd1316b7 Sync gen_build_prop.py to sysprop.mk 
Also fixes a bug on an if clause.

Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Id0dfba98f5cd67c939594554b470e7fad9cfd518
 2024-07-24 15:53:54 +09:00
Treehugger Robot
5ce1ad511e Merge "Fix DISPLAY_BUILD_NUMBER" into main am: 66884937f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3183859

Change-Id: I8c988d7a683c4de87096e85fe3175fd352c40067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-19 01:39:03 +00:00
Treehugger Robot
66884937f8 Merge "Fix DISPLAY_BUILD_NUMBER" into main 2024-07-19 01:25:17 +00:00
Inseob Kim
51d3a6d2d3 Fix DISPLAY_BUILD_NUMBER 
The dot was accidentally removed.

Bug: 353425495
Test: build
Change-Id: Id0c08f3c98d5b2f56e49180baf98bb8847f6bebd
 2024-07-19 09:26:36 +09:00
Treehugger Robot
813d92f068 Merge "Update run-ckati.sh to use JDK 21" into main am: 16afb50a6a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3180408

Change-Id: I45d56ca13fbe449aabf6bda36ba5e985f685d87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-18 17:31:43 +00:00
Sorin Basca
6b805b9384 Update run-ckati.sh to use JDK 21 
Bug: 342332820
Change-Id: Id6dd630a78ac790e682f6c839b6ab26cc3a5671b
Test: TH
 2024-07-18 09:39:00 +00:00
Treehugger Robot
404caf9295 Merge "Fix build error for gen_build_prop.py" into main am: b6c0bd1ace 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157119

Change-Id: I65df4789f6deeb0949523d5125790a3d1cf25900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-04 00:39:02 +00:00
Justin Yun
ac4a727793 Fix build error for gen_build_prop.py 
Provided undefined constants and imports.

Bug: 346214958
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ic65f059fe87a997a9be695ebf13dfde2d2c6f82c
 2024-07-03 13:34:29 +09:00
Treehugger Robot
21c898d598 Merge "Fix a bug that BUILD_VERSION_TAGS is ignored" into main am: 8884854267 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3144738

Change-Id: Ie7589807ed9632fa961aa2f10ee68a724be0d47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-26 02:50:40 +00:00
Inseob Kim
5a994c7e9c Fix a bug that BUILD_VERSION_TAGS is ignored 
Bug: 349046347
Test: set BUILD_VERSION_TAGS and build
Change-Id: Ib981d917435d23139ac0c5b0aba5b6893539d200
 2024-06-26 10:30:21 +09:00
Victor Chang
abf841134f Merge "Allow java, java. and jdk.* package_allowed_list.txt." into main 2024-06-20 09:32:44 +00:00
Victor Chang
9fc907642b Merge "Allow jdk.internal.event / .vm in the boot image" into main 2024-06-20 08:48:26 +00:00
Inseob Kim
2da72af53a Add build_prop soong module 
build_prop is a soong module generating {partition}/build.prop. It's
ported from build/make/core/sysprop.mk and will replace sysprop.mk in
the future. Currently used only by Android.bp cuttlefish system image.

Bug: 322090587
Bug: 346214958
Test: compare system/build.prop and aosp_cf_x86_64_system-build.prop for
      eng / user / userdebug
Change-Id: Iad76139fe86ec4f582218c185aa15baeacaa38dc
 2024-06-19 10:42:07 +09:00
Jiakai Zhang
a66c2c5b9b Allow java, java. and jdk.* package_allowed_list.txt. 
It avoids modifying this allowlist  when adding new packages into
core-oj.jar in the future.

(cherry-picked from f2fc54ff58b371872c357c33bd66b4b7ec7afe0e)

Bug: 346996451
Test: m
Merged-In: Iaf99efe73a3f9a43323d4c22238786db98993990
Merged-In: Icb208bb235f9c6ac97492c54c32a3174982756ae
Change-Id: Iaf99efe73a3f9a43323d4c22238786db98993990
 2024-06-18 15:38:58 +01:00
Inseob Kim
1d9148244f Use product_config from buildinfo_prop module 
Many parameters can be migrated to product_config module. This is also a
PoC, which is helpful for future build.prop migration.

Bug: 346214955
Test: compare buildinfo.prop before and after
Change-Id: I751220b3a09583e469ae721c0e49a1909b6428d7
 2024-06-18 09:56:53 +09:00
Inseob Kim
58c802f8e3 Add product_config module 
product_config module will export productVariables struct (defined in
android/variable.go). Other modules can depend on product_Config module
to read product variables, without needing to update Soong.

Bug: 346214955
Test: build and see output of product_config module
Change-Id: I06e1d2716dc2a8b90984bb46c5fc901cd1ca5020
 2024-06-18 09:56:45 +09:00
Victor Chang
78ba397272 Allow jdk.internal.event / .vm in the boot image 
Bug: 346542404
Test: m out/soong/boot-jars-package-check/stamp
Change-Id: I5ae8d4ff5aec1586c9090b8629d03237a5549295
 2024-06-17 15:19:03 +01:00
Treehugger Robot
e8cb9178ec Merge changes I5645ddb9,Ib3d50f15,Ib4c5815a,If3b63706 into main 
* changes:
  Revert "Revert^2 "Always embed jni libs and store uncompressed""
  Revert "Revert "Revert "Collect transitve deps of jni libs only for bund...""
  Revert "Add SkipToTransitiveDepsTag interface for dependency tags"
  Revert "Install transitive deps of jni libs, but not the jni libs themselves"
 2024-05-14 20:16:05 +00:00
Jiyong Park
d044bb40da Revert "Revert^2 "Always embed jni libs and store uncompressed"" 
This reverts commit 20df11ef2b.

Change-Id: I5645ddb9e0d2c0873916a9192aa3cfbc967fc2cc
 2024-05-15 03:32:26 +09:00
Treehugger Robot
82d7cdc547 Merge "Add the primary file to EXTRA_INSTALL_ZIPS" into main 2024-05-13 22:56:45 +00:00
Cole Faust
07c4537424 Add the primary file to EXTRA_INSTALL_ZIPS 
Make needs to know the primary file, because the zip is only extracted
when the primary file is installed.

Bug: 337869220
Test: m out/target/product/emu64x/obj/PACKAGING/system_intermediates/file_list.txt and checking it for the extra NetworkStackGoogle apks, with a local NetworkStackGoogle android_app_set added into the tree
Change-Id: I5cb7243d214f4730e3f9efb6746793f3bf4b8214
 2024-05-13 11:04:18 -07:00
Jiyong Park
b544a8b9ec Merge changes from topic "reland_embedded_jni" into main 
* changes:
  Install transitive deps of jni libs, but not the jni libs themselves
  Add SkipToTransitiveDepsTag interface for dependency tags
  Revert "Revert "Collect transitve deps of jni libs only for bund..."
  Revert^2 "Always embed jni libs and store uncompressed"
 2024-05-10 22:53:08 +00:00
Cole Faust
99bec75197 Create EXTRA_INSTALL_ZIPS variable 
Make needs to know about the "extra" zip files that are extracted
to the staging directories so that it can track all the installed files
correctly.

Also add a utility tool for listing the contents of relevant zips.

Bug: 337869220
Test: m droid and checked the contents of file_list.txt when adding an android_app_set locally
Change-Id: Idc5dd785b03c05f7972c66620d4e6359892b3863
 2024-05-09 14:20:11 -07:00
Jiyong Park
20df11ef2b Revert^2 "Always embed jni libs and store uncompressed" 
a71b90cf81

Change-Id: I1c071c5449fa04adb14d17774f882e6adbff196b
 2024-05-10 06:12:54 +09:00
Cole Faust
dfcb5c515b Remove embedded_launcher: true usages 
The default value for embedded_launcher has been changed to true.

Bug: 174041232
Test: Presubmits
Change-Id: I2fb4b920828307e60c0fae6864ba720c7c31e1f2
 2024-05-08 12:13:38 -07:00
Treehugger Robot
d02d710570 Merge changes from topic "revert-3075263-MMTOVXSVUO" into main 
* changes:
  Revert "Always embed jni libs and store uncompressed"
  Revert "Collect transitve deps of jni libs only for bundled apps"
 2024-05-08 09:48:24 +00:00