Commit Graph

33072 Commits

Author SHA1 Message Date
Dan Willemsen
a50ead8336 Merge changes from topic 'build-vts-zip'
am: d0c693ff64

Change-Id: Ic2b1d3165c4da7d89080f3016286a4a7ed815b2b
2017-01-04 23:05:35 +00:00
Keun Soo Yim
ed61c29cfd delete vts.mk (which is moved to test/vts)
am: 18a316c161

Change-Id: I1853517cff9d3697143b8c5c2fd6459e502040c4
2017-01-04 23:05:34 +00:00
Keun Soo Yim
33f6d707fa include VTS packaging task files
am: b74649d027

Change-Id: I94d3ceb03b7815b49291ca127fdd41a8affca8fe
2017-01-04 23:05:29 +00:00
Dan Willemsen
d0c693ff64 Merge changes from topic 'build-vts-zip'
* changes:
  delete vts.mk (which is moved to test/vts)
  include VTS packaging task files
2017-01-04 22:58:54 +00:00
Keun Soo Yim
18a316c161 delete vts.mk (which is moved to test/vts)
Test: m -j vts
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
(cherry picked from commit a942dc8433)
2017-01-04 13:16:33 -08:00
Keun Soo Yim
b74649d027 include VTS packaging task files
Test: m -j vts
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
(cherry picked from commit 199a710f73)
2017-01-04 13:16:33 -08:00
William Roberts
4165c635b8 fsconfig: fix pylint warning
Fix pylint warning:
W:292,47: Cell variable lineno defined in loop (cell-var-from-loop)

For the closure function that prints the error message, we actually
want the value of modified lineno within the closure.

Test: run unit tests

Change-Id: I7d08184563d347c826ca1af7558fb8e378f151e1
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-01-04 18:22:05 +00:00
William Roberts
820421c9b5 fsconfig: fix style formating with yapf
A few changes got introduced that yapf re-styles. To make it easy,
keep this file formated to:

yapf -i --style=google fs_config_generator.py

Test: run unit tests

Change-Id: I3160b92d7fd07a4d315dde59f1d20fe4c7587da1
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-01-04 18:21:28 +00:00
Hung-ying Tyan
150db0ea6f Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539
am: 82e3d0d007

Change-Id: I65daac2e70657ae651a705d3768555ab1b727d05
2017-01-04 02:48:19 +00:00
Hung-ying Tyan
82e3d0d007 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
am: 1a4a0a4539

Change-Id: Ic1bee5c763d5375c676f96db273d3126c85dd85b
2017-01-04 02:46:19 +00:00
Treehugger Robot
1a4a0a4539 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" 2017-01-04 02:44:04 +00:00
Elliott Hughes
d7217e2847 Merge "fs_config: Fix oem range parsing" am: ce6c8e629f
am: c16a64b832

Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb
2017-01-04 00:44:11 +00:00
Elliott Hughes
c16a64b832 Merge "fs_config: Fix oem range parsing"
am: ce6c8e629f

Change-Id: I74d198a2638b875233859a1c7ff723b04b47a353
2017-01-04 00:41:40 +00:00
Elliott Hughes
ce6c8e629f Merge "fs_config: Fix oem range parsing" 2017-01-04 00:37:58 +00:00
Tao Bao
085daa6451 Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596
am: 74b665fef1

Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820
2017-01-03 23:50:20 +00:00
Tao Bao
74b665fef1 Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
am: 7cfc591596

Change-Id: Ifaf7f387b840d9f3e59bdbf93beab41a245f7ed5
2017-01-03 23:48:21 +00:00
Tao Bao
7cfc591596 Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." 2017-01-03 23:44:41 +00:00
Richard Uhler
8a02582f70 Merge "Remove option for non-pic dex preopt." am: c184ef515c
am: ffb29d7497

Change-Id: I15c5c9f03f33a02a7f39e781e5e945fe5c74f4bd
2017-01-03 09:52:16 +00:00
Richard Uhler
ffb29d7497 Merge "Remove option for non-pic dex preopt."
am: c184ef515c

Change-Id: If76f8195ecb8b914fdea259de2e80ebebb5ebfe3
2017-01-03 09:44:21 +00:00
Treehugger Robot
c184ef515c Merge "Remove option for non-pic dex preopt." 2017-01-03 09:39:39 +00:00
Johan Redestig
1552a28e5f fs_config: Fix oem range parsing
Addresses the following build error:
  "value" not in valid range [], got: 2901 for: "AID_ABC" file:\
  "device/somc/abc/config.fs"

that happens when parsing device/somc/abc/config.fs:
  [AID_ABC]
  value: 2901

The problem is that the AID.PREFIX is 'AID_' so the _OEM_RANGE
expression is searching for AID__OEM_RESERVED, which never
exists. Drop the extra '_'.

Change-Id: I8a1556731e14e49cef66e3e91121e4be23a308e0
Test: ./build/tools/fs_config/fs_config_generator.py fsconfig --aid-header=system/core/include/private/android_filesystem_config.h device/somc/abc/config.fs
2017-01-03 09:45:33 +01:00
Tao Bao
3a2e350239 blockimgdiff.py: Clean up stash id computation in BBOTA v3+.
Only BBOTA v2 needs to maintain a pool of available 'stash slot id'.
BBOTA v3+ uses the hash of the stashed blocks as the slot id, which
doesn't need the id pool anymore.

Bug: 33694544
Test: Generate v2 and v4 incrementals w/ and w/o the CL. They produce
      the same packages respectively.
Change-Id: I8121af5b6b1bee98c3639d54a00b06fd12e378e8
2016-12-28 09:26:46 -08:00
Elliott Hughes
9d5a9e7c6e Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am: 5f60b74297
am: 71f582ac30

Change-Id: If090fbd6fef18dbed6258d58c7aa45d6ace27e14
2016-12-27 21:09:07 +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
71f582ac30 Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
am: 5f60b74297

Change-Id: Ib88d2780ee2a7ba0b070087cc1ed8921f4247100
2016-12-27 21:01:24 +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
Elliott Hughes
5f60b74297 Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" 2016-12-27 20:51:07 +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
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
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
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
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
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
4ad881c067 Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753
am: 1ef5112475

Change-Id: I7c16881f0efb637bf13a0af1e4c89640d7e218e6
2016-12-22 20:42:06 +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
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