Commit Graph

84358 Commits

Author SHA1 Message Date
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)
ea04e564c2 Revert^3 "Use Soong-built system/build.prop"
625f66136d

Change-Id: I69b09646fb3286dcc5df638f87625f4eb8dcfcb2
2024-07-25 09:21:09 +00:00
Inseob Kim
830ca7e843 Merge "Set output for build_prop even on Soong only build" into main am: b302108252
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195810

Change-Id: Ic34f587cac8542bdb89f27fa7e7fc1ef8c574c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:41 +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
66f64cbca0 Revert^2 "Add TARGET_SYSTEM_PROP to system build.prop" am: ff506d1af2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195638

Change-Id: I258cf8b600cce98a3821b6fdd0d6d152bf6de1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:28 +00:00
Inseob Kim
b302108252 Merge "Set output for build_prop even on Soong only build" into main 2024-07-25 07:27:59 +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
ff506d1af2 Revert^2 "Add TARGET_SYSTEM_PROP to system build.prop"
027f50246f

Change-Id: I3e2e8d90029f897f1dbf76a829518cb7fe4a47b1
2024-07-25 03:27:49 +00:00
Inseob Kim
3a69282271 Set output for build_prop even on Soong only build
Without this change, Soong only build may break unexpectedly if some
modules refer to the build_prop module.

Bug: 322090587
Test: soong only build
Change-Id: I7571bdf0aa6c08ade8f130842c84c02bb0233acb
2024-07-25 11:54:28 +09:00
Inseob Kim
155eb6e21d Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main am: 7d7baf7220
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195633

Change-Id: I35846419402c7a0cb075278ef1f9b83bff81aa88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:18 +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
7d7baf7220 Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main
* changes:
  Revert "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert "Sync gen_build_prop.py to sysprop.mk"
  Revert "Use Soong-built system/build.prop"
2024-07-25 02:48:23 +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
027f50246f Revert "Add TARGET_SYSTEM_PROP to 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: Ic089dc3dfcbf2083d1bcf2413be432dcb61ce525
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
c8a68e841f Add TARGET_SYSTEM_PROP to system build.prop am: bcc00559c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3182381

Change-Id: Ib1ba1c34304b6ae7b1a7833603162c438ec5ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:08:22 +00:00
Treehugger Robot
ccae8282a5 Merge changes from topic "avf_apex_android_bp_select" into main am: 6899b7ed22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3189226

Change-Id: I16408d5dc875b1d9329911b1be200d24184b039e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:07:48 +00:00
Inseob Kim
9424439b80 Make genrule's srcs property configurable am: 2f73062d47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3189225

Change-Id: I7f5041d13ab1ff06db66d69f987eb37499762651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:07:45 +00:00
Inseob Kim
5402171253 Make some apex properties configurable am: b114234f6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3189224

Change-Id: Ic6414ae157486b4d5b9a5bc31687b2f8524122b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:07:43 +00:00
Inseob Kim
ad58ccc6f0 Make the vintf_fragments property configurable am: f223702f3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3189223

Change-Id: I3ac05a32be2b38404bae44e2395f58fc533a1822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:07:39 +00:00
Inseob Kim
062f0e8730 Make the defaults property configurable am: f4889dbc88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3189222

Change-Id: Ib7a51008ff739ac06dec739772deb7ec13f12514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:07:36 +00:00
Inseob Kim
b93b9f0b3a Merge changes from topic "system_build_prop_soong" into main
* changes:
  Use Soong-built system/build.prop
  Sync gen_build_prop.py to sysprop.mk
  Add TARGET_SYSTEM_PROP to system build.prop
2024-07-25 02:07:00 +00:00
Treehugger Robot
6899b7ed22 Merge changes from topic "avf_apex_android_bp_select" into main
* changes:
  Make more apex properties configurable
  Make genrule's srcs property configurable
  Make some apex properties configurable
  Make the vintf_fragments property configurable
  Make the defaults property configurable
2024-07-25 01:52:54 +00:00
Treehugger Robot
bd43ddde89 Merge "Allow C symbol file to be arch variant" into main am: bd0b157c1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3190458

Change-Id: I1e30834617f32584c052986b4ee8a116a19508e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 01:35:26 +00:00
Treehugger Robot
bd0b157c1f Merge "Allow C symbol file to be arch variant" into main 2024-07-25 01:11:33 +00:00
Inseob Kim
d23e0d3244 Make more apex properties configurable
This allows using select statements with these.

* apps
* binaries
* prebuilts

Bug: 354824866
Test: m --no-skip-soong-tests
Change-Id: I8e28937d2fa6514b41bd189f56f9f584a60d2c80
2024-07-25 00:55:38 +00:00
Inseob Kim
2f73062d47 Make genrule's srcs property configurable
This allows using select statements with it.

Bug: 354824866
Test: m
Change-Id: If1d71ac177618ad3eb628cdec57469886ee27c88
2024-07-25 00:55:21 +00:00
Inseob Kim
b114234f6b Make some apex properties configurable
This allows using select statements with these.

* androidManifest
* canned_fs_config
* systemserverclasspath_fragments

Bug: 354824866
Test: m
Change-Id: I4c2182944ec14d99332f437c39a19ba0dc6b7731
2024-07-25 00:55:05 +00:00
Treehugger Robot
e6cf20d85f Merge "Add android.car.builtin to the Code Coverage instrumented list." into main am: 0cdc351829
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3192210

Change-Id: Ib78f8827e6dda2fcd8cec3bc6786f7d4aadf7124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 22:42:40 +00:00
Treehugger Robot
0cdc351829 Merge "Add android.car.builtin to the Code Coverage instrumented list." into main 2024-07-24 22:26:00 +00:00
Aditya Kumar
f1631b401d Merge "Enable -Wfortify-source" into main am: e97cded50d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3169582

Change-Id: Ib21e79c89aa4faa21347a18328a689cf7c3e3af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 20:12:33 +00:00
Aditya Kumar
e97cded50d Merge "Enable -Wfortify-source" into main 2024-07-24 19:56:11 +00:00
Treehugger Robot
e2f3bb3057 Merge "Ingore CC prebuilts from cmake snapshots" into main am: f2e5340072
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3190457

Change-Id: I54ea6b0db20866cfa92b9c37fbed1c65b0c93568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 18:27:23 +00:00
Treehugger Robot
f2e5340072 Merge "Ingore CC prebuilts from cmake snapshots" into main 2024-07-24 18:06:58 +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
Inseob Kim
bcc00559c6 Add TARGET_SYSTEM_PROP to system build.prop
System partition's build_prop output now contains TARGET_SYSTEM_PROP.
Soong needs to know paths to add them to ninja build dependency graph.

Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Ide73e876d28eda0cced2ec08bd3c680115025ad8
2024-07-24 15:53:54 +09:00
Filip Zakrzewski
c9f487b0e8 Add android.car.builtin to the Code Coverage instrumented list.
BUG=339901608

TEST=no

Change-Id: I3457dd843f3ebcefda4253b128ed142a7fa13e82
2024-07-24 04:27:45 +00:00
Kiyoung Kim
8a2bef0adb Merge "Remove VSDK related code from build" into main am: e51cb36a48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3188060

Change-Id: I676c7500fc17b602d0535c2edfb07376c4be538e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 03:52:43 +00:00
Kiyoung Kim
e51cb36a48 Merge "Remove VSDK related code from build" into main 2024-07-24 03:31:43 +00:00
Spandan Das
02be101893 Allow C symbol file to be arch variant
The libclang_rt.* prebuilt libraries have an autogenerated map.txt for
each arch. e.g.
```
$ ls prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan*map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-aarch64-android.map.txt  prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-riscv64-android.map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-arm-android.map.txt      prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-x86_64-android.map.txt
prebuilts/clang/host/linux-x86/clang-r530567/lib/clang/19/lib/linux/libclang_rt.asan-i686-android.map.txt
```

These map.txt files are currently a noop, but will be used to compile
stub srcs. In preparation for that, make stubs.symbol_file and
llndk.symbol_file arch variant

Test: m nothing # no diff in ninja file
Bug: 220898484
Change-Id: I7316546905c1327c764ee67a48c77a2a68465d77
2024-07-24 01:21:53 +00:00
Treehugger Robot
bacf273e83 Merge "Add C symbol file to module sdk snapshot" into main am: 562eaab091
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3191411

Change-Id: I319818c45fe72e898846dc66b0b0bea5e7eaf86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 23:37:31 +00:00
Treehugger Robot
562eaab091 Merge "Add C symbol file to module sdk snapshot" into main 2024-07-23 23:23:00 +00:00
Spandan Das
1f22939d81 Ingore CC prebuilts from cmake snapshots
The cmake snapshot scripts currently looks at the `cc.Module.compiler`
property to determine whether a cc_* module is a prebuilt. As part of
b/275273834. some cc_* prebuilt modules which provide APIs will have a
non-nil `compiler` to convert the API .txt file to stub .c files.

This CL updates the cmake generation script to ignore prebuilts using
the `IsPrebuilt` function rather than `cc.Module.compiler`

Bug: 275273834
Test: m nothing --no-skip-soong-tests
Change-Id: Id8ba22b1c5ad13fb31e75a407a25e97a8040d0b1
2024-07-23 22:36:10 +00:00
Jared Duke
7f47f02060 Merge "Support symbolized odex preopt output" into main am: 8f1340eb8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097979

Change-Id: Ie71ced52a0754f2918770351efdefc55b4369f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 22:24:29 +00:00