Commit Graph

13102 Commits

Author SHA1 Message Date
Colin Cross
bd9183c02b Merge "Allow guava to use java_host_for_device" into qt-dev-plus-aosp 2019-04-16 03:35:50 +00:00
Jaewoong Jung
a7d23ae804 Merge "Embed CSS entries in soong_build.html." am: 0a0b3fa605
am: 6d48aa4186

Change-Id: I0e162fdc0eabafc152686f637436b41295540935
2019-04-15 18:17:14 -07:00
Colin Cross
3b4319f2a9 Merge "Make makevars deterministic" am: a88fbdef78
am: 4315944c16

Change-Id: Ibca9e4b4a685ad0debde6972ec311c2f038071d5
2019-04-15 18:16:42 -07:00
Jaewoong Jung
6d48aa4186 Merge "Embed CSS entries in soong_build.html."
am: 0a0b3fa605

Change-Id: Ic5e983e1e7698a2fcea0c7a212680fe172ddf391
2019-04-15 18:04:15 -07:00
Colin Cross
4315944c16 Merge "Make makevars deterministic"
am: a88fbdef78

Change-Id: I3049dbbf63e9f889734a6d24e147a4024a1f03a3
2019-04-15 18:03:41 -07:00
Dan Willemsen
c74ce7d85f Convert yacc to a single RuleBuilder rule am: 4e0aa23dd3
am: e71c0691ad

Change-Id: I8e5b153cfeb7887777065dc8ee33d04dda36e613
2019-04-15 17:51:03 -07:00
Dan Willemsen
891af48379 Support RuleBuilder.Sbox to wrap commands in sbox am: 633c502295
am: b933c57635

Change-Id: I07cb4998e8d860f97c4ae00f9f776744cc8a5adf
2019-04-15 17:50:48 -07:00
Treehugger Robot
0a0b3fa605 Merge "Embed CSS entries in soong_build.html." 2019-04-16 00:49:18 +00:00
Treehugger Robot
a88fbdef78 Merge "Make makevars deterministic" 2019-04-16 00:43:35 +00:00
Dan Willemsen
e71c0691ad Convert yacc to a single RuleBuilder rule
am: 4e0aa23dd3

Change-Id: I5d629683fa99cbbc0b6f97517a1cb9c5e8c6bb89
2019-04-15 17:24:18 -07:00
Dan Willemsen
b933c57635 Support RuleBuilder.Sbox to wrap commands in sbox
am: 633c502295

Change-Id: Ica1be18f391e583cc98317dedd06f41c27afed9c
2019-04-15 17:24:01 -07:00
Jaewoong Jung
5f867c0580 Embed CSS entries in soong_build.html.
This will prevent it from being affected by future css location changes.

Test: m soong_docs
Fixes: 130567020
Change-Id: I80fd7b8a12a32bcea7b270423b8d8f8dc0976177
2019-04-15 15:21:55 -07:00
Dan Willemsen
4e0aa23dd3 Convert yacc to a single RuleBuilder rule
So that <module>/gen/yacc/... is (re)created by a single rule, previous
files are removed, and location.hh is in the build graph when it is
produced.

Test: treehugger
Change-Id: I2f6e47ea07f315e10ae1cb8ad50697e7123d0285
2019-04-15 14:52:05 -07:00
Dan Willemsen
633c502295 Support RuleBuilder.Sbox to wrap commands in sbox
This essentially allows you to declare that everything in a directory
will be created by the rule, and we'll ensure that your command actually
writes out all of the claimed outputs, and remove any other files that
previously existed in that directory.

Test: built-in tests
Change-Id: I990dce2b3a0d89ebd2736ac1a0cadfb5864c6e73
2019-04-15 14:52:05 -07:00
Colin Cross
c9b80a8d37 Merge "Export more config variables" into qt-dev
am: 5e037c38d3

Change-Id: Idb65f0ecbe580a2f5755f621ec5f20da886f7ecb
2019-04-12 12:28:53 -07:00
Colin Cross
40e013b2e5 Merge "Fix package path of android/soong/android pctx" into qt-dev
am: 353222b81d

Change-Id: I8b16c32517604f9dfaa282acf1303dd539f71ea8
2019-04-12 12:28:31 -07:00
TreeHugger Robot
5e037c38d3 Merge "Export more config variables" into qt-dev 2019-04-12 17:24:18 +00:00
TreeHugger Robot
353222b81d Merge "Fix package path of android/soong/android pctx" into qt-dev 2019-04-12 17:24:18 +00:00
Dan Willemsen
804e7f5e41 [automerger skipped] Expose TargetFSConfigGen to DeviceConfig from Make
am: 898efa15a1 -s ours
am skip reason: change_id I2675822ae01af9bbec70f0c0413c047f36b5e024 with SHA1 71c7460713 is in history

Change-Id: Ib294658f28fdbc98700708cb83db04e327588e67
2019-04-12 09:22:07 -07:00
Colin Cross
91268c668c Make makevars deterministic
Sort map keys before iterating over them to produce makevars.

Bug: 130411407
Test: m checkbuild
Change-Id: I4153977705da05a5c73e641f93d02f408209c897
2019-04-12 14:55:16 +00:00
Dimitry Ivanov
32b75cfea2 Merge "Make apex_key HostAndDeviceDefault" am: 4bca455fd9
am: 94c4de38df

Change-Id: I5ff15a8bdc76d73859f0b8ba876caba50b8767b2
2019-04-12 02:44:46 -07:00
Dimitry Ivanov
94c4de38df Merge "Make apex_key HostAndDeviceDefault"
am: 4bca455fd9

Change-Id: Id849c0a5b5c3007ed6cb6d89f806c14b5f033ad3
2019-04-12 02:40:47 -07:00
Dimitry Ivanov
4bca455fd9 Merge "Make apex_key HostAndDeviceDefault" 2019-04-12 09:26:15 +00:00
dimitry
f807167023 Make apex_key HostAndDeviceDefault
Since apex_key is used in number of apex_test host_supported modules it
is no longer a device only module.

Test: add new device target and check that the build does not fail
Change-Id: I6402e3b622d22ee0ca0e6af71dfd71a690938e49
2019-04-12 09:26:00 +00:00
Christopher Ferris
7d98c1e4ed [automerger skipped] Merge "Do not re-export _Unwind_XXX symbols." am: 41eed99dc7
am: e0728ccb3a -s ours
am skip reason: change_id I79673753bb8197041bfe8ffb016d9f5fdf4cada5 with SHA1 cf78867417 is in history

Change-Id: I5139f587c1d547699d833daa9e3a966cf1aa75a7
2019-04-11 22:02:47 -07:00
Christopher Ferris
e0728ccb3a Merge "Do not re-export _Unwind_XXX symbols."
am: 41eed99dc7

Change-Id: I71ecd9be29895f799728d341e5407043e4af1812
2019-04-11 21:58:45 -07:00
Christopher Ferris
41eed99dc7 Merge "Do not re-export _Unwind_XXX symbols." 2019-04-12 04:42:43 +00:00
Christopher Ferris
c3a1e22060 Do not re-export _Unwind_XXX symbols.
Bug: 130267141

Test: All system shared libraries do not contain global _Unwind_XXX symbols.
Change-Id: I79673753bb8197041bfe8ffb016d9f5fdf4cada5
Merged-In: I79673753bb8197041bfe8ffb016d9f5fdf4cada5
(cherry picked from commit cf78867417)
2019-04-11 17:54:48 -07:00
Dan Willemsen
64e8416056 Merge "Expose TargetFSConfigGen to DeviceConfig from Make" am: 8235220a82
am: a0fcf98136

Change-Id: Iafb6fd966ea4c38ed488e3d34de0df7ffe0f6b37
2019-04-11 16:47:58 -07:00
Dan Willemsen
a0fcf98136 Merge "Expose TargetFSConfigGen to DeviceConfig from Make"
am: 8235220a82

Change-Id: I86575fdbf340e00d37a2aea2c1f990f0772d2669
2019-04-11 16:42:50 -07:00
Colin Cross
b5191a573d Allow guava to use java_host_for_device
Guava can't compile against a device bootclasspath, it uses methods
that only exist in the host bootclasspath, and then avoids calling
them at runtime.

Bug: 130306229
Test: m checkbuild
Change-Id: I012030cb701c01ea9ff554c1b6156d0242365a4c
2019-04-11 16:42:34 -07:00
Dan Willemsen
898efa15a1 Expose TargetFSConfigGen to DeviceConfig from Make
Bug: 118089258
Test: m oemaids_header_gen oemaids_headers
Change-Id: I2675822ae01af9bbec70f0c0413c047f36b5e024
Merged-In: I2675822ae01af9bbec70f0c0413c047f36b5e024
(cherry picked from commit 71c7460713)
2019-04-11 16:42:06 -07:00
Treehugger Robot
8235220a82 Merge "Expose TargetFSConfigGen to DeviceConfig from Make" 2019-04-11 23:36:09 +00:00
Colin Cross
5a1a3ee1be [automerger skipped] Merge "Fix python proto srczip argument order" into qt-dev
am: cdec2035fd -s ours
am skip reason: change_id I62a998f1ad1e3b45f590babbf39330955d368373 with SHA1 09364fd955 is in history

Change-Id: I426b4288a5e74b35b42e3b36e36e29869f0aaba7
2019-04-11 16:33:35 -07:00
Colin Cross
537cfd2477 Merge "pom2bp: add jar deps to -nodeps modules" am: 34df71446f
am: 694b4629e1

Change-Id: I519921487ae1813091e08074df70376fa39efb61
2019-04-11 16:23:49 -07:00
Colin Cross
694b4629e1 Merge "pom2bp: add jar deps to -nodeps modules"
am: 34df71446f

Change-Id: I8d737ccfc8ad3f2e876c3c3f152289e15b52a3f1
2019-04-11 16:18:46 -07:00
Colin Cross
6db352f959 Zip boot image am: df8eebecaa
am: c832b1516d

Change-Id: I8319c546fe77d80a5090bad90adedaace4ad53d6
2019-04-11 16:18:45 -07:00
Colin Cross
c832b1516d Zip boot image
am: df8eebecaa

Change-Id: Ie65258473f7e35e76a4f7887321cf18a177aba0f
2019-04-11 16:13:43 -07:00
Treehugger Robot
34df71446f Merge "pom2bp: add jar deps to -nodeps modules" 2019-04-11 23:11:23 +00:00
Colin Cross
df8eebecaa Zip boot image
Create a zip file containing the zipped boot image files.

Test: m out/soong/sailfish/dex_bootjars/boot.zip
Change-Id: I1b08c9aca962a5999585cbe9e665693ef4558524
2019-04-11 23:03:23 +00:00
Christopher Ferris
06af038ad0 Merge "Do not re-export _Unwind_XXX symbols." into qt-dev
am: 8f8b1f1746

Change-Id: Ief4cd4264b80acb1c9b553aec2fda275cdd3dde5
2019-04-11 15:48:49 -07:00
TreeHugger Robot
cdec2035fd Merge "Fix python proto srczip argument order" into qt-dev 2019-04-11 22:46:25 +00:00
Christopher Ferris
8f8b1f1746 Merge "Do not re-export _Unwind_XXX symbols." into qt-dev 2019-04-11 22:20:04 +00:00
Colin Cross
5599d79117 Fix python proto srczip argument order
-P has to come before -D to have an effect on the files read from the
directory.

Fixes: 130160833
Test: atest acloud_test
Change-Id: I62a998f1ad1e3b45f590babbf39330955d368373
Merged-In: I62a998f1ad1e3b45f590babbf39330955d368373
(cherry picked from commit 09364fd955)
2019-04-11 14:13:43 -07:00
Logan Chien
a85b0a12db Merge "Add --llndk for NDK libs as well" am: b10243dc4e
am: 09b2c81f09

Change-Id: Ide2c9829a1fc94ce68884b77005354cabbfaa08a
2019-04-11 11:11:08 -07:00
Colin Cross
8e84648a63 Export more config variables
Export some more config variables that will be used to generate
robolectric's build.prop file.

Bug: 122331577
Test: m checkbuild
Change-Id: I39f3436ed5d5c4e730dd3e1f86c840cf6358ec87
2019-04-11 10:54:18 -07:00
Logan Chien
09b2c81f09 Merge "Add --llndk for NDK libs as well"
am: b10243dc4e

Change-Id: I4756fb19c5ac88c1897f19f5217326c337a45c86
2019-04-11 09:51:48 -07:00
Logan Chien
b10243dc4e Merge "Add --llndk for NDK libs as well" 2019-04-11 16:38:42 +00:00
Colin Cross
97743b85c7 Merge "Fix relative path of bpf modules" am: 33055f641a
am: e4b73830d7

Change-Id: I7902c67b65d15b3dc18d35e592c81681dc7cde5d
2019-04-11 00:08:13 -07:00
Logan Chien
62f1f9488e Add --llndk for NDK libs as well
This commit add `--llndk` to the command line option for
`create_reference_dumps.py` as well.

Bug: 124620774
Bug: 130324828
Test: lunch aosp_arm64-userdebug && make
Change-Id: I117864209b8cf8c934fd3aa1086b7691c1c449e3
2019-04-11 05:40:57 +00:00