Commit graph

32845 commits

Author SHA1 Message Date
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
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
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
Dan Willemsen
cf324af6b8 Remove generated java source post clean logic
Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.

Bug: 30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
      is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
2016-12-22 10:37:31 -08:00
Vijay Venkatraman
029741e4a8 Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""" am: 0c29ffb74d
am: 01fa928500

Change-Id: Iec4bb1e049e1c531744a3aeeed074488e22a3e34
2016-12-22 06:09:00 +00:00
Vijay Venkatraman
64a1b146af Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am: 43a7f0c765
am: b3ada4048f

Change-Id: Iebc8f31f1d8bd5fab5557a706f8d2d25d97e507a
2016-12-22 06:08:46 +00:00
Vijay Venkatraman
01fa928500 Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."""
am: 0c29ffb74d

Change-Id: Idd3792357787a0265aca742fd82439dad394a2e7
2016-12-22 06:03:17 +00:00
Vijay Venkatraman
b3ada4048f Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
am: 43a7f0c765

Change-Id: Ie5bfee7624066314f3446c8eeb5e7d202702016e
2016-12-22 06:03:16 +00:00
Vijay Venkatraman
0c29ffb74d Merge "Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""" 2016-12-22 05:54:03 +00:00
Vijay Venkatraman
43a7f0c765 Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
This reverts commit 823172e209.

Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-22 05:53:39 +00:00
Dan Willemsen
9416c20b79 Support non-gtest NATIVE_TESTS
We've had this in Soong for a while, but never supported it in Make.

Bug: 33819328
Test: Change LOCAL_GTEST on a module, check m -j ... showcommands
Change-Id: Id8f4b9908c82c05d9a986a38945b33bac578e991
2016-12-21 20:27:06 -08:00
Tao Bao
f2cffd6849 Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" am: 376c0146b3
am: 7def52bfe8

Change-Id: I4473d91d021fc17bd3412bae0967a68dc7283aff
2016-12-21 06:22:52 +00:00
Tao Bao
7def52bfe8 Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file"
am: 376c0146b3

Change-Id: I97065c6e4e0a6d90dde92b96deb97f520b83c21b
2016-12-21 06:17:22 +00:00
Tao Bao
376c0146b3 Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" 2016-12-21 06:08:23 +00:00
Tao Bao
b6f7b14c0e Merge "otatools: added missing shared library for make_ext4fs" am: 0ced0a1f50
am: 372a877659

Change-Id: I5cc501bd8f78cb4b1611bbc7e0e3b0a58bfd91f4
2016-12-21 04:41:17 +00:00
Tao Bao
372a877659 Merge "otatools: added missing shared library for make_ext4fs"
am: 0ced0a1f50

Change-Id: I6586f71273ff21a6f9ca44cfba6808248e62bd3b
2016-12-21 04:35:46 +00:00
Tao Bao
0ced0a1f50 Merge "otatools: added missing shared library for make_ext4fs" 2016-12-21 04:30:26 +00:00
Mark Salyzyn
76e0e2a53e Merge "logpersist: introduce split to logcat and logpersist domains" am: 04f2cbd92a
am: 76b36cfb98

Change-Id: Iec4ad75f0cd7d7171b506df7ea529a8152e3f4f5
2016-12-20 22:16:22 +00:00
Mark Salyzyn
76b36cfb98 Merge "logpersist: introduce split to logcat and logpersist domains"
am: 04f2cbd92a

Change-Id: I58f23b14630913eebe8ada09fa23c8ed9fbd90b0
2016-12-20 22:12:29 +00:00
Treehugger Robot
04f2cbd92a Merge "logpersist: introduce split to logcat and logpersist domains" 2016-12-20 22:08:42 +00:00
Hiroshi Yamauchi
9876e6483b Merge "Add ART_USE_READ_BARRIER to product variables." am: e34819ccce
am: f9e277e1fe

Change-Id: I4a0addd85f0e1dcc98250a60084f88be118276cc
2016-12-20 20:40:10 +00:00
Mark Salyzyn
239ef9d502 logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms

Test: compile
Bug: 30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
2016-12-20 20:32:01 +00:00
Hiroshi Yamauchi
f9e277e1fe Merge "Add ART_USE_READ_BARRIER to product variables."
am: e34819ccce

Change-Id: Iaa92156d93110ddfd1a95f677bc02abc6dbcb5c5
2016-12-20 19:04:19 +00:00
Hiroshi Yamauchi
e34819ccce Merge "Add ART_USE_READ_BARRIER to product variables." 2016-12-20 18:56:20 +00:00
Vikram Dattu
29e88b850e HOST_OUT_EXECUTABLES path is not needed in misc_info file
HOST_OUT_EXECUTABLES is already added to the PATH variable,
so it is not needed to add the path info for binaries in
misc_info.txt and <partition>_image_info.txt.

Earlier the mkuserimg item in the build_image dictionary is
hardcoded to "mkuserimg.sh", but now it is customized for
mkuserimg.sh and mkuserimg_mke2fs.sh, and maintained in
dictionary "ext_mkuserimg=$(MKEXTUSERIMG)" in misc_info.txt
and <partition>_image_info.txt, where it is used in the
build_image script while creating the images.

The problem here is the value for this key is set to build
path of the file mkuserimg file
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh,
i.e. out/host/linux_x86/bin/mkuserimg.sh,
there by standalone signing the images using otatools is
not working as the executables are packed in bin folder.

Test: tools/releasetools/sign_target_files_apks
    -p <extracted ota-tools.zip folder>
    --extra_signapk_args=-f /etc/opt/cert_data.dat
    -v
    --replace_verity_private_key ~/build/target/product/security/verity
    --replace_verity_public_key ~/build/target/product/security/verity.x509.pem
    -k <key maping>
    <input target files zip>
    <output target files zip>

Change-Id: I57af1025ec38f3794f779c49faa0bf965afc6a5d
2016-12-20 13:55:06 +01:00