tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
71283 commits 1 branch 0 tags 119 MiB
Commit graph

71283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mathew Inwood
65e6a0d3f9 Add libincident. am: e24af74376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I43a5b3ba570bd32049b2e15e67e9ead0846843ba
 2021-07-30 10:42:59 +00:00
Alexander Smundak
214387c421 Merge "Implement copy_files function" am: 5f75aafb00 am: a146198aa5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1781017

Change-Id: I858d1039f0933d52de591b9099c454191eb56010
 2021-07-30 02:35:27 +00:00
Alexander Smundak
ba28f07d46 Merge changes I129136e8,I278bd8ed,I1d22ed6f am: 510c0014d5 am: bd4362926e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1781014

Change-Id: I96d9919f4b65a548b57d2bc8eee38d2fd02baa73
 2021-07-30 02:35:20 +00:00
Alexander Smundak
a146198aa5 Merge "Implement copy_files function" am: 5f75aafb00 
Original change: https://android-review.googlesource.com/c/platform/build/+/1781017

Change-Id: I0b4aa2b96494553bf8c75552391f950e434211f4
 2021-07-30 02:15:10 +00:00
Alexander Smundak
bd4362926e Merge changes I129136e8,I278bd8ed,I1d22ed6f am: 510c0014d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1781014

Change-Id: I170b5019f68467845e68d07e5a4f6262ea5138d3
 2021-07-30 02:14:55 +00:00
Alexander Smundak
5f75aafb00 Merge "Implement copy_files function" 2021-07-30 01:56:27 +00:00
Alexander Smundak
510c0014d5 Merge changes I129136e8,I278bd8ed,I1d22ed6f 
* changes:
  Implement add_soong_namespace and add_soong_config_var_value functions
  Trim spaces in the rule actions
  Add copy-files macro
 2021-07-30 01:56:01 +00:00
Sasha Smundak
a93e3d9985 Implement copy_files function 
Bug: 193540681
Test: treehugger
Change-Id: Iffc64551e733747a9a29c14b1f674b3a533f44ba
 2021-07-29 11:42:29 -07:00
Sasha Smundak
c106138baf Implement add_soong_namespace and add_soong_config_var_value functions 
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I129136e83d2d00ef5b64d3aab07b98719198dcfe
 2021-07-29 11:24:35 -07:00
Sasha Smundak
0e4a5ad24b Trim spaces in the rule actions 
When rule action contains something like
  cp $(FOO) ...
and FOO is set with
FOO := a \
 b \

the generated Ninja file constains extra spaces, making it
difficult to compare it to the same file generated by the
Starlark-based product configuration.

Bug: 181797530
Test: manual
Change-Id: I278bd8edf0f017a31c5b5115b2a38f4f663c55fc
 2021-07-29 10:57:06 -07:00
Sasha Smundak
31b6b9442a Add copy-files macro 
To allow refactoring a lot of product configuration makefiles.

Bug: 190051051
Test: treehugger
Change-Id: I1d22ed6f3df17fb616bd272c0d928aa1fdb9729a
 2021-07-29 10:57:06 -07:00
Mathew Inwood
e24af74376 Add libincident. 
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.

Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
 2021-07-29 14:59:29 +00:00
satayev
ed13797a44 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 72602c4687 am: 60305dceb3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1780030

Change-Id: I59996e715382eaef027fbdfa00793d49e5a8adc4
 2021-07-29 11:56:03 +00:00
satayev
60305dceb3 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 72602c4687 
Original change: https://android-review.googlesource.com/c/platform/build/+/1780030

Change-Id: Id3724ead89315c34975d9222c084ee436d19a7c5
 2021-07-29 11:40:49 +00:00
satayev
72602c4687 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Kelvin Zhang
399ac4de96 Merge "Fix a bug in computing streaming property of payload.bin" am: 8ee181df52 am: dfb6300fab 
Original change: https://android-review.googlesource.com/c/platform/build/+/1742854

Change-Id: I04f505016e23dadf3c52419208feb7d074f67378
 2021-07-28 22:20:32 +00:00
Kelvin Zhang
dfb6300fab Merge "Fix a bug in computing streaming property of payload.bin" am: 8ee181df52 
Original change: https://android-review.googlesource.com/c/platform/build/+/1742854

Change-Id: I5c67ac40f81379ca7f6c6f8a23f8f08ec28f8b01
 2021-07-28 22:07:26 +00:00
Kelvin Zhang
8ee181df52 Merge "Fix a bug in computing streaming property of payload.bin" 2021-07-28 21:51:49 +00:00
Kelvin Zhang
25ab998d82 Fix a bug in computing streaming property of payload.bin 
When computing the data offset of an entry in zip file, we used length
of extra field from central directory. That is correct most of the time
but wrong if the extra field in central directory has different length
than the one in local file directory. Since python's zipfile doesn't
provide an API to access local file header, we need to parse local file
header ourselves and extract length of extra field.

An incorrect offset will cause magic mismatch error from update_engine,
as update_engine expects to find uncompressed payload at the recorded
offset.

Test: th, partner verification
Bug: 191443484

Change-Id: Id670cd79b0bd65adffaaa5224ae4f8065d66b358
 2021-07-28 11:40:18 -04:00
Martin Stjernholm
31b606b9fc Force MODULE_BUILD_FROM_SOURCE if com.google.android.xxx modules aren't am: 523de300dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15347314

Change-Id: I3e8c1a1101672ec17325846372163d05a99e6b85
 2021-07-28 14:04:14 +00:00
Roland Levillain
632157c554 Merge "Add extra owners for file core/tasks/art-host-tests.mk." am: 7b763f0d46 am: bfc914edff 
Original change: https://android-review.googlesource.com/c/platform/build/+/1780027

Change-Id: Ia1ab9f51cedd523e5536c25a87d9f5ef1549e873
 2021-07-28 13:21:07 +00:00
Roland Levillain
bfc914edff Merge "Add extra owners for file core/tasks/art-host-tests.mk." am: 7b763f0d46 
Original change: https://android-review.googlesource.com/c/platform/build/+/1780027

Change-Id: I63de125da2b9b12347f4a4e881f5f9d6a97cc666
 2021-07-28 13:05:42 +00:00
satayev
ed0817932b Rename UpdatableSystemServerJars to ApexSystemServerJars. 
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
 2021-07-28 14:03:57 +01:00
Roland Levillain
7b763f0d46 Merge "Add extra owners for file core/tasks/art-host-tests.mk." 2021-07-28 12:51:01 +00:00
satayev
c1df52682c [automerger skipped] Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." am: 96fa127572 am: 08c0c44470 -s ours 
am skip reason: Merged-In I3b12f26237636f4271cb000480928b3ce1c2e62f with SHA-1 fa21749ffd is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1779472

Change-Id: Ia3bb9d0e2cff0ed53d57c85e6a9fbb361aa31c71
 2021-07-28 11:06:06 +00:00
satayev
08c0c44470 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." am: 96fa127572 
Original change: https://android-review.googlesource.com/c/platform/build/+/1779472

Change-Id: Iacf3bb2d7ec8f5c57aca86c4b5c5cefe03a17190
 2021-07-28 10:48:53 +00:00
satayev
96fa127572 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." 2021-07-28 10:36:39 +00:00
Martin Stjernholm
523de300dd Force MODULE_BUILD_FROM_SOURCE if com.google.android.xxx modules aren't 
installed.

Test: env TARGET_PRODUCT=redfin build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns ""
Test: env TARGET_PRODUCT=aosp_redfin build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns "true"
Test: env TARGET_PRODUCT=coral_hwasan build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns "true"
Bug: 193759980
Bug: 192556458
Bug: 194067130
Change-Id: I8023564e6e22969a9b18467ec8b1ef046333e181
 2021-07-28 10:05:29 +00:00
Roland Levillain
a83337de67 Merge "Work around art-host-tests build issues when using ART prebuilts." am: add7902aab am: 06704bd09f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1779476

Change-Id: If02fc30b815695bc473055db98c1a5c1bbd95930
 2021-07-28 09:58:43 +00:00
Roland Levillain
06704bd09f Merge "Work around art-host-tests build issues when using ART prebuilts." am: add7902aab 
Original change: https://android-review.googlesource.com/c/platform/build/+/1779476

Change-Id: I5417b8e4fd3e4e715ae43ff8fd993cde7721f959
 2021-07-28 09:45:42 +00:00
Artur Satayev
b4e1d8d916 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." into sc-dev-plus-aosp 2021-07-28 09:36:19 +00:00
Roland Levillain
add7902aab Merge "Work around art-host-tests build issues when using ART prebuilts." 2021-07-28 09:29:49 +00:00
Roland Levillain
6db8228316 Add extra owners for file core/tasks/art-host-tests.mk. 
Test: build/make/tools/checkowners.py -c build/make/core/tasks/OWNERS
Bug: 169111770
Change-Id: I6dbbabd35386d806a786e1d895070bb2c19fa2c6
 2021-07-28 10:21:56 +01:00
Jooyung Han
f593c9d9fc Merge "cleanup: remove unnecessary steps in apex_utils" am: 6c4e8d5f97 am: 7d364b9616 
Original change: https://android-review.googlesource.com/c/platform/build/+/1774707

Change-Id: Ibc5dec464b76b0735d2b6c9995cc939b2d69718f
 2021-07-28 01:26:05 +00:00
Jooyung Han
7d364b9616 Merge "cleanup: remove unnecessary steps in apex_utils" am: 6c4e8d5f97 
Original change: https://android-review.googlesource.com/c/platform/build/+/1774707

Change-Id: Iacca6a96111d74ef8f47d8864950006df92cd707
 2021-07-28 01:11:18 +00:00
Jooyung Han
6c4e8d5f97 Merge "cleanup: remove unnecessary steps in apex_utils" 2021-07-28 00:56:41 +00:00
satayev
a85d5225ee Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS. 
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
 2021-07-27 16:09:52 +00:00
satayev
fa21749ffd Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS. 
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
 2021-07-27 16:55:10 +01:00
Roland Levillain
4d9d0aa86c Work around art-host-tests build issues when using ART prebuilts. 
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
 2021-07-27 15:00:48 +01:00
Kelvin Zhang
ef6abfb65e Merge "Skip vbmeta_system if it doesn't exist" am: 7fd6933e90 am: 8c87445740 
Original change: https://android-review.googlesource.com/c/platform/build/+/1778766

Change-Id: I7005809518f1ef325e4643e35b442e9777e4e0fb
 2021-07-27 13:59:41 +00:00
Kelvin Zhang
8c87445740 Merge "Skip vbmeta_system if it doesn't exist" am: 7fd6933e90 
Original change: https://android-review.googlesource.com/c/platform/build/+/1778766

Change-Id: I412f17ebe23fe2e1ebea87cd40c72d61f702a775
 2021-07-27 13:37:07 +00:00
Kelvin Zhang
7fd6933e90 Merge "Skip vbmeta_system if it doesn't exist" 2021-07-27 13:18:49 +00:00
Kelvin Zhang
a19fb315e0 Skip vbmeta_system if it doesn't exist 
Test: validate_target_files bonito-target_files-7582772.zip
Change-Id: I2da4f5a7897b1ef155e17441a8f5b97c0716d601
 2021-07-27 09:17:05 -04:00
Jiyong Park
878480152f [automerger skipped] Merge changes from topic "remove_ndk_platform" am: f253430313 am: 1c34f0f4a9 -s ours 
am skip reason: Merged-In I5745e9deb6eb6786fe4084a5b8e92925b70a8551 with SHA-1 ee3ddc7159 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1777766

Change-Id: I0b0c1ce01d22ba417a6f60935f9829ab44911ad4
 2021-07-27 01:23:48 +00:00
Jiyong Park
ca4eb02c0b [automerger skipped] Reland: *-ndk.so libraries are added to the VNDK set. am: d502a48dc4 am: 6acc7707c3 -s ours 
am skip reason: Merged-In I4c45fdfd64159370813c40c8fa5554744b630746 with SHA-1 fa50d58e0a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1777765

Change-Id: Ia5873a84114000493e3dfb94102a56e1e2bad722
 2021-07-27 01:23:46 +00:00
Jiyong Park
1c34f0f4a9 Merge changes from topic "remove_ndk_platform" am: f253430313 
Original change: https://android-review.googlesource.com/c/platform/build/+/1777766

Change-Id: Ic9557abc1e59bf451261c2f86c8d06e5fb6dfd04
 2021-07-27 01:19:35 +00:00
Jiyong Park
6acc7707c3 Reland: *-ndk.so libraries are added to the VNDK set. am: d502a48dc4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1777765

Change-Id: I0f85a1baa6f5d8cc91dcf3375cedf3fb8ad54c78
 2021-07-27 01:19:34 +00:00
Jiyong Park
f253430313 Merge changes from topic "remove_ndk_platform" 
* changes:
  Fix build
  Reland: *-ndk.so libraries are added to the VNDK set.
 2021-07-27 01:01:58 +00:00
satayev
ebd074993f Merge "Rename UpdatableBootJars to ApexBootJars." am: 2bcf499b56 am: 425479d7fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/1772896

Change-Id: I6a41e786042f9e1fe21f529142d424991391ea3a
 2021-07-26 18:29:56 +00:00
satayev
425479d7fe Merge "Rename UpdatableBootJars to ApexBootJars." am: 2bcf499b56 
Original change: https://android-review.googlesource.com/c/platform/build/+/1772896

Change-Id: I6626ec0ce1e3f18c814589e34e38e907da2fee6c
 2021-07-26 18:18:50 +00:00