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

34493 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
21c197238d Revert "Revert "Merge changes from topic 'fsconfig-2'"" am: 2d7c86dfea am: feb4f2e54a am: 8a2ed5159c 
am: 3315b71ca8

Change-Id: I385eb63030834d9d684baee6157d1a5777d117b1
 2016-12-27 21:23:25 +00:00
Elliott Hughes
3315b71ca8 Revert "Revert "Merge changes from topic 'fsconfig-2'"" am: 2d7c86dfea am: feb4f2e54a 
am: 8a2ed5159c

Change-Id: I7ff77ba1282fbddedbd10a3a63b055ac36ee83ae
 2016-12-27 21:15:54 +00:00
Elliott Hughes
8a2ed5159c Revert "Revert "Merge changes from topic 'fsconfig-2'"" am: 2d7c86dfea 
am: feb4f2e54a

Change-Id: I5e6d138662e8f21f85e77466f897ffab9afd0f2d
 2016-12-27 21:08:52 +00:00
Elliott Hughes
feb4f2e54a Revert "Revert "Merge changes from topic 'fsconfig-2'"" 
am: 2d7c86dfea

Change-Id: I825336a18f7d7525bb49dd65d24ddccbfef84ba5
 2016-12-27 21:01:23 +00:00
Alan Viverette
bff527c846 Merge "Update pathmap.mk for renderscript support library migration" am: cafc7efee0 am: 7621a86097 am: 670a4b4fa6 
am: 29a50bf5f9

Change-Id: I2a055502b81c1ae40d13ee4320fd47c3a9bcca10
 2016-12-23 03:27:07 +00:00
Alan Viverette
29a50bf5f9 Merge "Update pathmap.mk for renderscript support library migration" am: cafc7efee0 am: 7621a86097 
am: 670a4b4fa6

Change-Id: Ibae6e9e2b0eed11390b3d36970894952116c1a90
 2016-12-23 03:21:05 +00:00
Alan Viverette
670a4b4fa6 Merge "Update pathmap.mk for renderscript support library migration" am: cafc7efee0 
am: 7621a86097

Change-Id: I9adc6741d91caf5c575c11070b2277a50c3dc940
 2016-12-23 03:15:04 +00:00
Alan Viverette
7621a86097 Merge "Update pathmap.mk for renderscript support library migration" 
am: cafc7efee0

Change-Id: Ic85e61e12524b46073a0fd3b092eb42bc6d5c283
 2016-12-23 03:08:34 +00:00
Treehugger Robot
cafc7efee0 Merge "Update pathmap.mk for renderscript support library migration" 2016-12-23 03:02:55 +00:00
Alan Viverette
0609b9d88d Update pathmap.mk for renderscript support library migration am: b78260919d am: e8b339d1d3 
am: 3561ef6e5d

Change-Id: I418ae1ced029ea62548c48a550ff31d807a5825d
 2016-12-23 01:50:31 +00:00
Alan Viverette
3561ef6e5d Update pathmap.mk for renderscript support library migration am: b78260919d 
am: e8b339d1d3

Change-Id: Ibe6eee89e8e1d847f42d1a79eb7ccb6d2fe39d8a
 2016-12-23 01:44:29 +00:00
Alan Viverette
e8b339d1d3 Update pathmap.mk for renderscript support library migration 
am: b78260919d

Change-Id: Ic8bdcfa3e55cb6b1f501efbff9aee9304811f41f
 2016-12-23 01:38:28 +00:00
Alan Viverette
cdeb44df2f Update pathmap.mk for renderscript support library migration 
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
 2016-12-22 17:32:20 -08:00
Colin Cross
260d88d1b5 Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp am: 5b0573233f 
am: 18e41ccfd4

Change-Id: I7c43fdee7d36a6347992a3e7ff8163657b8a71e0
 2016-12-23 01:08:04 +00:00
Alan Viverette
6af41c1a3b Update pathmap.mk for renderscript support library migration am: 74b13397d9 
am: 0824969f88

Change-Id: Ieff7c67b4dd900cc567c072100f216741db3520d
 2016-12-23 01:07:57 +00:00
Colin Cross
18e41ccfd4 Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp 
am: 5b0573233f

Change-Id: Ie35be50e72068a71bc0e5cb64c48da529a60ffb2
 2016-12-23 01:02:06 +00:00
Alan Viverette
0824969f88 Update pathmap.mk for renderscript support library migration 
am: 74b13397d9

Change-Id: I503654db7c70d6785e9b2559e9709fb06177733e
 2016-12-23 01:01:56 +00:00
Alan Viverette
b78260919d Update pathmap.mk for renderscript support library migration 
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
 2016-12-23 00:55:56 +00:00
Colin Cross
5b0573233f Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp 2016-12-23 00:54:33 +00:00
Dan Willemsen
74bd04bd56 Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am: fb2efba189 am: 952d5adcde am: bbf841d45f 
am: e72210bc9c

Change-Id: I7d4998440b40aa5b3aa02aceb46338742a78dc3d
 2016-12-23 00:03:50 +00:00
Alan Viverette
e883e1e1ef Update pathmap.mk for renderscript support library migration 
am: 0da362dc66

Change-Id: I23fcde8d1143d6c19ce70cad4aa907a6bdab10e4
 2016-12-23 00:02:57 +00:00
Dan Willemsen
e72210bc9c Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am: fb2efba189 am: 952d5adcde 
am: bbf841d45f

Change-Id: I0086eb66a855525560c3b962773350c221f9bb3d
 2016-12-22 23:45:17 +00:00
Dan Willemsen
bbf841d45f Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am: fb2efba189 
am: 952d5adcde

Change-Id: I57b99cf8d157dbcf8f10e8d1d4b56a8529d1354f
 2016-12-22 23:39:47 +00:00
Dan Willemsen
952d5adcde Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" 
am: fb2efba189

Change-Id: I63dd0ac17a099ac6da5e8e63be280983e042a839
 2016-12-22 23:33:46 +00:00
Dan Willemsen
fb2efba189 Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" 2016-12-22 23:27:38 +00:00
Alan Viverette
74b13397d9 Update pathmap.mk for renderscript support library migration 
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
 2016-12-22 23:27:18 +00:00
Alan Viverette
0da362dc66 Update pathmap.mk for renderscript support library migration 
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
 2016-12-22 23:06:58 +00:00
Dan Willemsen
584e4724ba Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags 
We really should be re-running Kati when a file in here changes, since
it may actually affect the result. The general problem we've run into is
when there are two kati output files that are clean according to the
current rules, but if they actually ran we'd force an installclean.

This also had the side-effect of not running shell commands that touched
$OUT_DIR, like writing files using $(shell echo ... >out/...), now those
may be run.

This will cause Kati to re-read the makefiles more often -- twice when a
CleanSpec.mk changes, twice when switching products on the same device.
Basically every time we read the old state, do something about it, and
write out the new state, we need to rerun the next time so we aren't
continuously cleaning up what changed.

Bug: 30947985
Test: Manual, switching between configurations; enable --regen_debug
Change-Id: I888f9f8295f318f8214b2c79525cf94f457a5a8b
 2016-12-22 22:19:19 +00:00
Dan Willemsen
8532f40a2b Merge "Fix incremental builds with AAPT2" am: d25d80e193 am: b99d4b9e55 am: 59ac51ee24 
am: e97fe30ea4

Change-Id: I55db82e99f0de24aec9a1efc71c11dbc3cc1745d
 2016-12-22 21:47:22 +00:00
Steven Moreland
8bcc1ea56b Merge "embedded.mk: +android.hidl.memory@1.0-service" am: c1a11ec83f am: fbeb6b5f8f am: cfeaa71933 
am: 553aa3d931

Change-Id: Ia39f4efa9ee10f218bed315e6939fed916368062
 2016-12-22 21:46:14 +00:00
Dan Willemsen
e97fe30ea4 Merge "Fix incremental builds with AAPT2" am: d25d80e193 am: b99d4b9e55 
am: 59ac51ee24

Change-Id: I78e58b155cee575e5313effb642d3843ef9d75cc
 2016-12-22 21:41:49 +00:00
Steven Moreland
553aa3d931 Merge "embedded.mk: +android.hidl.memory@1.0-service" am: c1a11ec83f am: fbeb6b5f8f 
am: cfeaa71933

Change-Id: I0dd9004b41917caba17adc5af2a263212eef3da3
 2016-12-22 21:40:43 +00:00
Dan Willemsen
59ac51ee24 Merge "Fix incremental builds with AAPT2" am: d25d80e193 
am: b99d4b9e55

Change-Id: Ia623c9d0dddd26478174044c83c3eab34edc322b
 2016-12-22 21:37:04 +00:00
Steven Moreland
cfeaa71933 Merge "embedded.mk: +android.hidl.memory@1.0-service" am: c1a11ec83f 
am: fbeb6b5f8f

Change-Id: I4ceba4ea994f9c9304f7c54c16cf373f0170ac22
 2016-12-22 21:35:42 +00:00
Dan Willemsen
b99d4b9e55 Merge "Fix incremental builds with AAPT2" 
am: d25d80e193

Change-Id: Iaee5e4d0588fcf15c73005f3ca68c5db51dcc5b7
 2016-12-22 21:31:32 +00:00
Steven Moreland
fbeb6b5f8f Merge "embedded.mk: +android.hidl.memory@1.0-service" 
am: c1a11ec83f

Change-Id: Ib83eb02579543c0ad4b0954c9632cc26cd568d85
 2016-12-22 21:30:13 +00:00
Dan Willemsen
d25d80e193 Merge "Fix incremental builds with AAPT2" 2016-12-22 21:28:25 +00:00
Treehugger Robot
c1a11ec83f Merge "embedded.mk: +android.hidl.memory@1.0-service" 2016-12-22 21:20:37 +00:00
Dan Willemsen
912de8e691 Fix incremental builds with AAPT2 
When we removed the src/ directory, the R.stamp file was removed -- with
AAPT, this triggers src/android/Manifest.java to be regenerated. But
AAPT2 only uses the R.stamp file as a timestamp to find the
Manifest.java file, not to create it.

So add a new CleanSpec.mk to fix the builds by removing the target that
AAPT2 uses to generate the src/android/Manifest.java file.

Test: None
Change-Id: If56f326ad701f7f92aa7c8aeda57e92d9c62cff9
 2016-12-22 13:18:21 -08:00
Dan Willemsen
1d324167f1 Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753 am: 1ef5112475 am: 4ad881c067 
am: 27f489cd00

Change-Id: I85c5afe2a217c8335320885b00fc61ffbf159ba7
 2016-12-22 20:53:08 +00:00
Dan Willemsen
27f489cd00 Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753 am: 1ef5112475 
am: 4ad881c067

Change-Id: Id4968904ba43183e38c04aa3cc83754bd599c1fb
 2016-12-22 20:47:36 +00:00
Dan Willemsen
4ad881c067 Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753 
am: 1ef5112475

Change-Id: I7c16881f0efb637bf13a0af1e4c89640d7e218e6
 2016-12-22 20:42:06 +00:00
Dan Willemsen
a006925a03 Merge "Remove generated java source post clean logic" am: f57aa792c3 am: 5208e4f473 am: 5ae5671a3b 
am: b585264834

Change-Id: Ic9d89893213616a13df5530f382fa2ec4d4e964e
 2016-12-22 20:36:07 +00:00
Dan Willemsen
1ef5112475 Merge "Support non-gtest NATIVE_TESTS" 
am: 561b0a3753

Change-Id: I2da6eb4db2e4ee03b2699c60540f79b580a1fad0
 2016-12-22 20:36:06 +00:00
Dan Willemsen
b585264834 Merge "Remove generated java source post clean logic" am: f57aa792c3 am: 5208e4f473 
am: 5ae5671a3b

Change-Id: Id43b680d5297ea0f3bcff3cbd42e6b16b50de167
 2016-12-22 20:30:06 +00:00
Dan Willemsen
561b0a3753 Merge "Support non-gtest NATIVE_TESTS" 2016-12-22 20:29:41 +00:00
Dan Willemsen
5ae5671a3b Merge "Remove generated java source post clean logic" am: f57aa792c3 
am: 5208e4f473

Change-Id: I18c9cf7fa19346e08d25d9fcba3b5538a7bf1127
 2016-12-22 20:24:35 +00:00
Dan Willemsen
5208e4f473 Merge "Remove generated java source post clean logic" 
am: f57aa792c3

Change-Id: I03b0b0368cd3e5500d60981c06135490af8eb3a9
 2016-12-22 20:18:35 +00:00
Treehugger Robot
f57aa792c3 Merge "Remove generated java source post clean logic" 2016-12-22 20:09:13 +00:00
Steven Moreland
7676451252 embedded.mk: +android.hidl.memory@1.0-service 
This is the service that provides shared memory for hidl/treble
processes.

Bug: 32185232
Test: builds
Change-Id: I79162a781daad7aa704f4ee071fef0bbdea59a18
 2016-12-22 11:39:11 -08:00