OSDN Git Service
Dan Willemsen [Thu, 22 Dec 2016 20:24:35 +0000 (20:24 +0000)]
Merge "Remove generated java source post clean logic" am:
f57aa792c3
am:
5208e4f473
Change-Id: I18c9cf7fa19346e08d25d9fcba3b5538a7bf1127
Dan Willemsen [Thu, 22 Dec 2016 20:18:35 +0000 (20:18 +0000)]
Merge "Remove generated java source post clean logic"
am:
f57aa792c3
Change-Id: I03b0b0368cd3e5500d60981c06135490af8eb3a9
Treehugger Robot [Thu, 22 Dec 2016 20:09:13 +0000 (20:09 +0000)]
Merge "Remove generated java source post clean logic"
Dan Willemsen [Thu, 22 Dec 2016 01:37:00 +0000 (17:37 -0800)]
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
Vijay Venkatraman [Thu, 22 Dec 2016 06:09:00 +0000 (06:09 +0000)]
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
Vijay Venkatraman [Thu, 22 Dec 2016 06:08:46 +0000 (06:08 +0000)]
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
Vijay Venkatraman [Thu, 22 Dec 2016 06:03:17 +0000 (06:03 +0000)]
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
Vijay Venkatraman [Thu, 22 Dec 2016 06:03:16 +0000 (06:03 +0000)]
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
Vijay Venkatraman [Thu, 22 Dec 2016 05:54:02 +0000 (05:54 +0000)]
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."""
Vijay Venkatraman [Tue, 20 Dec 2016 17:50:21 +0000 (17:50 +0000)]
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
823172e209ab92dbae6dd5a4ef750f73dbfc5aa8.
Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
Tao Bao [Wed, 21 Dec 2016 06:22:52 +0000 (06:22 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" am:
376c0146b3
am:
7def52bfe8
Change-Id: I4473d91d021fc17bd3412bae0967a68dc7283aff
Tao Bao [Wed, 21 Dec 2016 06:17:22 +0000 (06:17 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file"
am:
376c0146b3
Change-Id: I97065c6e4e0a6d90dde92b96deb97f520b83c21b
Tao Bao [Wed, 21 Dec 2016 06:08:23 +0000 (06:08 +0000)]
Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file"
Tao Bao [Wed, 21 Dec 2016 04:41:17 +0000 (04:41 +0000)]
Merge "otatools: added missing shared library for make_ext4fs" am:
0ced0a1f50
am:
372a877659
Change-Id: I5cc501bd8f78cb4b1611bbc7e0e3b0a58bfd91f4
Tao Bao [Wed, 21 Dec 2016 04:35:46 +0000 (04:35 +0000)]
Merge "otatools: added missing shared library for make_ext4fs"
am:
0ced0a1f50
Change-Id: I6586f71273ff21a6f9ca44cfba6808248e62bd3b
Tao Bao [Wed, 21 Dec 2016 04:30:26 +0000 (04:30 +0000)]
Merge "otatools: added missing shared library for make_ext4fs"
Mark Salyzyn [Tue, 20 Dec 2016 22:16:22 +0000 (22:16 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains" am:
04f2cbd92a
am:
76b36cfb98
Change-Id: Iec4ad75f0cd7d7171b506df7ea529a8152e3f4f5
Mark Salyzyn [Tue, 20 Dec 2016 22:12:29 +0000 (22:12 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains"
am:
04f2cbd92a
Change-Id: I58f23b14630913eebe8ada09fa23c8ed9fbd90b0
Treehugger Robot [Tue, 20 Dec 2016 22:08:41 +0000 (22:08 +0000)]
Merge "logpersist: introduce split to logcat and logpersist domains"
Hiroshi Yamauchi [Tue, 20 Dec 2016 20:40:10 +0000 (20:40 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables." am:
e34819ccce
am:
f9e277e1fe
Change-Id: I4a0addd85f0e1dcc98250a60084f88be118276cc
Mark Salyzyn [Wed, 26 Oct 2016 21:19:32 +0000 (14:19 -0700)]
logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms
Test: compile
Bug:
30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
Hiroshi Yamauchi [Tue, 20 Dec 2016 19:04:19 +0000 (19:04 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables."
am:
e34819ccce
Change-Id: Iaa92156d93110ddfd1a95f677bc02abc6dbcb5c5
Hiroshi Yamauchi [Tue, 20 Dec 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables."
Vikram Dattu [Fri, 16 Dec 2016 08:45:19 +0000 (09:45 +0100)]
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
Vikram Dattu [Fri, 16 Dec 2016 15:33:03 +0000 (16:33 +0100)]
otatools: added missing shared library for make_ext4fs
Added the missing shared library libpcre2.so for make_ext4fs
in the otatools.zip.
Standalone signing the images with otatools zip is not working
due to missing library for make_ext4fs.
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: I4fc71a1c710f3075bb3bdb90d915538526004ee6
Hiroshi Yamauchi [Fri, 16 Dec 2016 00:00:41 +0000 (16:00 -0800)]
Add ART_USE_READ_BARRIER to product variables.
Bug:
33492005
Test: top-level build for angler.
Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8
Tao Bao [Mon, 19 Dec 2016 21:25:46 +0000 (21:25 +0000)]
Merge "blockimgdiff.py: Add a test case for ReviseStashSize()." am:
f967849693
am:
a10cd259fc
Change-Id: Ib8102e58f5c5df97550aa200a392ff4e0d567f00
Tao Bao [Mon, 19 Dec 2016 21:22:45 +0000 (21:22 +0000)]
Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."
am:
f967849693
Change-Id: Ibb1ffeb5c5e13578b4669c5525d270c4f3b7175d
Tao Bao [Mon, 19 Dec 2016 21:15:17 +0000 (21:15 +0000)]
Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."
Tao Bao [Mon, 19 Dec 2016 19:01:38 +0000 (11:01 -0800)]
blockimgdiff.py: Add a test case for ReviseStashSize().
Bug:
33687949
Test: python -m unittest test_blockimgdiff
Change-Id: I31e42648d2c0e60b941908c098ce5ccc967861ca
Daniel Cashman [Sat, 17 Dec 2016 01:16:42 +0000 (01:16 +0000)]
Merge "Revert "Add build dependencies for split sepolicy files."" am:
cbdc0bd096
am:
5e8be7b822
Change-Id: I6b1e6db6a505f8a65879228dc8fa9b1863724ca1
Daniel Cashman [Sat, 17 Dec 2016 01:08:18 +0000 (01:08 +0000)]
Merge "Revert "Add build dependencies for split sepolicy files.""
am:
cbdc0bd096
Change-Id: Ie73ea2b943a153422e0373ef291f7306747e5420
Daniel Cashman [Sat, 17 Dec 2016 00:59:42 +0000 (00:59 +0000)]
Merge "Revert "Add build dependencies for split sepolicy files.""
Daniel Cashman [Sat, 17 Dec 2016 00:53:52 +0000 (00:53 +0000)]
Revert "Add build dependencies for split sepolicy files."
This reverts commit
086189145caa9b154d02aa3a888a8815bb60a0d5.
Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
dcashman [Sat, 17 Dec 2016 00:32:40 +0000 (00:32 +0000)]
Merge "Add build dependencies for split sepolicy files." am:
298f9b5925
am:
bc1832f381
Change-Id: Ic0a40500003afdd54e1a68cfec2937ae0f2aee06
dcashman [Sat, 17 Dec 2016 00:23:38 +0000 (00:23 +0000)]
Merge "Add build dependencies for split sepolicy files."
am:
298f9b5925
Change-Id: I8e8ef53b98d4341deab6f5ddb54cac6f30329e9c
Treehugger Robot [Sat, 17 Dec 2016 00:17:12 +0000 (00:17 +0000)]
Merge "Add build dependencies for split sepolicy files."
Tao Bao [Sat, 17 Dec 2016 00:15:05 +0000 (00:15 +0000)]
Merge "releasetools: Fix the computation in ReviseStashSize()." am:
9cc98767ad
am:
bf32e87669
Change-Id: I505288a01a652337a8290ee148959b24a0d79ea4
Tao Bao [Sat, 17 Dec 2016 00:07:34 +0000 (00:07 +0000)]
Merge "releasetools: Fix the computation in ReviseStashSize()."
am:
9cc98767ad
Change-Id: I2fbadc053c017b3a52cc2856f9b86511b8cb6a44
Tao Bao [Fri, 16 Dec 2016 23:57:40 +0000 (23:57 +0000)]
Merge "releasetools: Fix the computation in ReviseStashSize()."
dcashman [Mon, 28 Nov 2016 15:19:35 +0000 (07:19 -0800)]
Add build dependencies for split sepolicy files.
Add build targets for split sepolicy files so they'll appear in the root dir for
on-device compilation. nonplat_sepolicy will eventually be removed as it should
be provided by a different partition. Also replace sepolicy.recovery with the
appropriate split components.
Bug:
31363362
Test: Policy builds on-device and boots.
Change-Id: I017dabe6940c3cd20de6c00bb5253274d5a9269b
Joe LaPenna [Fri, 16 Dec 2016 20:43:06 +0000 (20:43 +0000)]
Merge "Add default NetworkRecommendation to core.mk" am:
95f616b960
am:
f4251ee777
Change-Id: I95ab94b579c4e72f685bcfc2d7b68127dbc060e8
Joe LaPenna [Fri, 16 Dec 2016 20:35:04 +0000 (20:35 +0000)]
Merge "Add default NetworkRecommendation to core.mk"
am:
95f616b960
Change-Id: Ice21caa64e01e15911d9f5979cd0db345e5686f1
Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Add default NetworkRecommendation to core.mk"
Tao Bao [Fri, 16 Dec 2016 19:13:55 +0000 (11:13 -0800)]
releasetools: Fix the computation in ReviseStashSize().
We compute the max stashed_blocks in ReviseStashSize(), prior to calling
WriteTransfers(), to avoid running out of space due to stashing.
There is a bug when computing the to-be-freed stashed blocks, where we
wrongly free the space _before_ executing the transfer command. This leads
to a script failure where the max stash size violates the max allowed
size in WriteTransfers().
Note that this bug doesn't affect already generated packages. It's only
an underestimate in ReviseStashSize(). The check in WriteTransfers() has
been correct to ensure the max stash size.
Bug:
33687949
Test: Successfully generated incremental OTA which failed previously.
Change-Id: I4f4f043c6f521fce81ca5286e6156f22d99bf7f7
Joe LaPenna [Thu, 8 Dec 2016 00:06:43 +0000 (16:06 -0800)]
Add default NetworkRecommendation to core.mk
This makes the apk avaiable on all devices and can be overridden on a
per-product basis using LOCAL_OVERRIDES_PACKAGES.
BUG:
33224286
Test: Verified with lunch aosp_bullhead-userdebug; make
Change-Id: Ib345193caa4431b6405294bd8759d93349335814
Alex Klyubin [Fri, 16 Dec 2016 17:38:53 +0000 (17:38 +0000)]
Merge "aapt no longer needed for signing APKs" am:
3cfff7386f
am:
2c70770e93
Change-Id: I920311adea1085830df6ed992711e26aed38c2a1
Alex Klyubin [Fri, 16 Dec 2016 17:38:40 +0000 (17:38 +0000)]
Merge "Remove unused get-package-min-sdk-version-int" am:
5a1ba84c30
am:
24b383a770
Change-Id: Iafe2ea0495e9c1b5c77eb4d995101c60e85700af
Alex Klyubin [Fri, 16 Dec 2016 17:30:23 +0000 (17:30 +0000)]
Merge "aapt no longer needed for signing APKs"
am:
3cfff7386f
Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533
Alex Klyubin [Fri, 16 Dec 2016 17:30:09 +0000 (17:30 +0000)]
Merge "Remove unused get-package-min-sdk-version-int"
am:
5a1ba84c30
Change-Id: Id5b5c1a36f6fe6ef85f9cee12a7e49dacd416801
Alex Klyubin [Fri, 16 Dec 2016 17:21:13 +0000 (17:21 +0000)]
Merge "aapt no longer needed for signing APKs"
Alex Klyubin [Fri, 16 Dec 2016 17:20:23 +0000 (17:20 +0000)]
Merge "Remove unused get-package-min-sdk-version-int"
Vijay Venkatraman [Fri, 16 Dec 2016 02:26:34 +0000 (02:26 +0000)]
Merge "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:
e4be608d2f
am:
fe371b310f
Change-Id: I9b086d31ef7197798d5f0a38864321622b99cccf
Vijay Venkatraman [Fri, 16 Dec 2016 02:26:19 +0000 (02:26 +0000)]
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:
823172e209
am:
e9709b4575
Change-Id: I8166568b64cbda20c35fb4b07ea24ce6578158fc
Vijay Venkatraman [Fri, 16 Dec 2016 02:17:48 +0000 (02:17 +0000)]
Merge "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:
e4be608d2f
Change-Id: I236dd4c28d4bbe65fc51fb3fbd599a3a23129b14
Vijay Venkatraman [Fri, 16 Dec 2016 02:17:47 +0000 (02:17 +0000)]
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:
823172e209
Change-Id: If6249d3b311089ea342fb873288ad38c12bc53d1
Vijay Venkatraman [Fri, 16 Dec 2016 02:11:11 +0000 (02:11 +0000)]
Merge "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.""
Vijay Venkatraman [Fri, 16 Dec 2016 02:08:18 +0000 (02:08 +0000)]
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
2b6c204c73b97147ec00484904ee6f4bc003cb15.
Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
Alex Klyubin [Thu, 15 Dec 2016 20:53:58 +0000 (12:53 -0800)]
Remove unused get-package-min-sdk-version-int
The only user of get-package-min-sdk-version-int was signapk. signapk
no longer needs to be provided with the APK's minSdkVersion though.
(cherry picked from commit
e185da21ca07006c5ced90e1577c0682566428de)
Test: make clean && make
Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
Alex Klyubin [Thu, 15 Dec 2016 20:51:25 +0000 (12:51 -0800)]
aapt no longer needed for signing APKs
signapk now auto-detects the APK's minSdkVersion, removing the need to
run aapt dump badging during APK signing.
Test: make clean && make
Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd
Vijay Venkatraman [Thu, 15 Dec 2016 23:02:47 +0000 (23:02 +0000)]
Merge "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:
b777f169f8
am:
fe9ba5edf4
Change-Id: I9049593af944687aea3b9c664b75a03e025c4a96
Vijay Venkatraman [Thu, 15 Dec 2016 23:02:29 +0000 (23:02 +0000)]
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:
2b6c204c73
am:
23da9097fe
Change-Id: I1724efa79766e50eaccc9cd43fa5a143494397ec
Vijay Venkatraman [Thu, 15 Dec 2016 21:37:30 +0000 (21:37 +0000)]
Merge "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:
b777f169f8
Change-Id: I7d0c58f2c1be9084b8a78a7fa32c9dab6eb31756
Vijay Venkatraman [Thu, 15 Dec 2016 21:37:29 +0000 (21:37 +0000)]
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:
2b6c204c73
Change-Id: Iea702c06134f40b312c795ce13d41fa94bc62e15
Vijay Venkatraman [Thu, 15 Dec 2016 21:26:16 +0000 (21:26 +0000)]
Merge "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."
dcashman [Thu, 15 Dec 2016 20:40:16 +0000 (20:40 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
b8888197c6
am:
63a91e9ee0
Change-Id: I3f1600730dc239093fa525c854a903d583510c12
dcashman [Thu, 15 Dec 2016 20:40:10 +0000 (20:40 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
15171f641e
am:
f976eae6f3
Change-Id: I09424929985bfeff10c14853e89af2ae8ac9f9e8
dcashman [Thu, 15 Dec 2016 20:27:32 +0000 (20:27 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
b8888197c6
Change-Id: Id0785ec8105d31cb8dd21780be3552588c4ce9e8
dcashman [Thu, 15 Dec 2016 20:26:40 +0000 (20:26 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
15171f641e
Change-Id: Ic2ad780d79f58d8fcffffcae7e3aaefda5b4be4f
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
dcashman [Wed, 14 Dec 2016 21:48:48 +0000 (13:48 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
Dan Willemsen [Thu, 15 Dec 2016 07:34:41 +0000 (07:34 +0000)]
Merge "Remove variables exported by Soong" am:
f61205d5c7
am:
da8f49522d
Change-Id: I09c678146df1537df9e0f02eb112db031374f04c
Dan Willemsen [Thu, 15 Dec 2016 07:27:36 +0000 (07:27 +0000)]
Merge "Remove variables exported by Soong"
am:
f61205d5c7
Change-Id: I2140a80261c0062e220656e6017b3142d486176f
Dan Willemsen [Thu, 15 Dec 2016 07:27:35 +0000 (07:27 +0000)]
Merge "Don't clean generated java sources when AIDL list changes" am:
e9c4079e91
am:
c29cf6efb6
Change-Id: I678611486f3f7c2951a02722224d3bbabae49e8b
Treehugger Robot [Thu, 15 Dec 2016 07:19:03 +0000 (07:19 +0000)]
Merge "Remove variables exported by Soong"
Dan Willemsen [Thu, 15 Dec 2016 07:13:05 +0000 (07:13 +0000)]
Merge "Don't clean generated java sources when AIDL list changes"
am:
e9c4079e91
Change-Id: I854de56628e16c12a771f18423274e5409ee374b
Treehugger Robot [Thu, 15 Dec 2016 07:01:12 +0000 (07:01 +0000)]
Merge "Don't clean generated java sources when AIDL list changes"
Dan Willemsen [Thu, 15 Dec 2016 03:53:54 +0000 (19:53 -0800)]
Don't clean generated java sources when AIDL list changes
AIDL doesn't generate into the intermediate src directory, we pass exact
aidl->java files to the compiler. So there is no need to clean the
intermediate src directory when the aidl file list changes for a module.
Test: None, just code inspection
Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6
Dan Willemsen [Thu, 15 Dec 2016 00:45:09 +0000 (00:45 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" am:
d3cc4950f8
am:
bfedf05812
Change-Id: Ic1b4310f3eec77d1dd193589f05f19e1232ed68f
Dan Willemsen [Thu, 15 Dec 2016 00:38:40 +0000 (00:38 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
am:
d3cc4950f8
Change-Id: Ie22b04f74b035bfbe1985dbb1f5bc82e43d50e4a
Dan Willemsen [Thu, 15 Dec 2016 00:30:03 +0000 (00:30 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
Dan Willemsen [Wed, 14 Dec 2016 23:54:01 +0000 (15:54 -0800)]
Remove variables exported by Soong
LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading. LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.
Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.
Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
Alex Klyubin [Wed, 14 Dec 2016 23:54:36 +0000 (23:54 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion" am:
620686f3c6
am:
1f5e43cb6f
Change-Id: Ic6e4f9ba7941b45a166f75e49d85b951055a42e4
Alex Klyubin [Wed, 14 Dec 2016 23:48:06 +0000 (23:48 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion"
am:
620686f3c6
Change-Id: Idc1d55388577032f009027170fcf69e72666b793
Alex Klyubin [Wed, 14 Dec 2016 23:42:13 +0000 (23:42 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion"
Tao Bao [Wed, 14 Dec 2016 21:06:56 +0000 (21:06 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints." am:
a282ceeb73
am:
bf9e4aa53f
Change-Id: I34c65b0de83c16630c576a2f25488bb0b13f5fb9
Tao Bao [Wed, 14 Dec 2016 21:00:25 +0000 (21:00 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints."
am:
a282ceeb73
Change-Id: I233432e2a64cc52409129a8ef628461f31e700c9
Alex Klyubin [Tue, 13 Dec 2016 02:19:17 +0000 (18:19 -0800)]
Faster auto-detection of APK's minSdkVersion
Prior to this change, when signing APKs, the build system invoked
'aapt dump badging' on each APK, to detect the value to pass into
signapk as --min-sdk-version. Now that signapk uses the apksig
library, it can auto-detect that value on its own, thus avoiding the
need to invoke 'aapt dump badging' and thus speeding up the build
process.
The semantics of signapk's --min-sdk-version flag is changed by this
commit from having the default value of 0 to having the default value
of "auto-detect from APK".
P.S. The get-package-min-sdk-version-int is not removed from
core/definitions.mk in this commnit, because this function is used in
another project's .mk file and thus that .mk file needs to be modified
first.
Test: rm -Rf out/ && make
Change-Id: I0972fcf0abbde9cbf6794e6c05c743c77c8a78f9
Treehugger Robot [Wed, 14 Dec 2016 20:53:02 +0000 (20:53 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints."
Tao Bao [Wed, 14 Dec 2016 19:53:38 +0000 (11:53 -0800)]
releasetools: Add prefix when dumping fingerprints.
We used to dump "Source: <fingerprint>" in update logs. The "Source: "
prefix was unintentionally dropped out.
Test: Check the generated incremental BBOTA script.
Change-Id: I4de62333aa38e3fb09a76df0e769b62af48e0313
Dan Willemsen [Wed, 14 Dec 2016 04:08:57 +0000 (04:08 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am:
dd0e69d47f
am:
04cf52edab
Change-Id: I49c20d55c5fd7af70b536b530d3a747e788e3931
Dan Willemsen [Wed, 14 Dec 2016 04:02:27 +0000 (04:02 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests"
am:
dd0e69d47f
Change-Id: I48e88dde1e93d25a4981036e952eddac669f99f3
Treehugger Robot [Wed, 14 Dec 2016 03:52:31 +0000 (03:52 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests"
Dan Willemsen [Wed, 14 Dec 2016 02:28:33 +0000 (18:28 -0800)]
Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert
Soong only supports exporting include directories under the current
directory. So bring non-local directories up as a potential problem in
soong_to_convert.txt
Test: m -j $OUT/soong_to_convert.txt, inspect
Change-Id: I7a15b92e10a1d8b8d3496c6f0529a0d0824f301e
Dan Willemsen [Sat, 10 Dec 2016 00:05:09 +0000 (16:05 -0800)]
Implement LOCAL_TEST_DATA to ship data with tests
This can be used to ship source data as test artifacts next to native
tests. It works for both local builds and the test bundles using
package_modules.mk.
You just specify a file list relative to the local directory, and those
files will be copied next to the executable under
/data/nativetest*/<module>/...:
LOCAL_MODULE := mytest
LOCAL_TEST_DATA := data/file1 file2
/data/nativetest/mytest/mytest
/data/nativetest/mytest/data/file1
/data/nativetest/mytest/file2
If the data is in another directory, you may also specify a different
prefix for the source files:
LOCAL_TEST_DATA := external/skia:resources/f.xml
/data/nativetest/skia_test/resources/f.xml
And there's a new convenience macro to find a list of files in this
format:
LOCAL_TEST_DATA := $(call find-test-data-in-subdirs,external/skia,"*.xml",resources)
I'll expand this to native benchmarks and fuzz tests in a later change,
since they don't have their own module classes yet.
Bug:
30564705
Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continuous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Change-Id: Ic76a7b62e7f567f259c4ab1510ee97d26600ba9a
Adam Seaton [Wed, 14 Dec 2016 00:40:54 +0000 (00:40 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258
am:
2d08201d3b
Change-Id: I783aefe051f60100dff27cad415108cd693869e0
Adam Seaton [Wed, 14 Dec 2016 00:40:49 +0000 (00:40 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231 am:
dec80c416e
am:
89e9059995
Change-Id: Iee0a4138b5293e3c2ad6b6017548b029a99c88fd
Adam Seaton [Wed, 14 Dec 2016 00:40:43 +0000 (00:40 +0000)]
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0 am:
eaf4508b09 am:
2cc397f4c5
am:
548f3ec0d3
Change-Id: Idf5473287d764e87705930d0ad439f8b727780cf
Adam Seaton [Wed, 14 Dec 2016 00:34:23 +0000 (00:34 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3
am:
32e254e258
Change-Id: I7b9e67e87349a4646ab25a413e018dc98b53f3f2
Adam Seaton [Wed, 14 Dec 2016 00:34:18 +0000 (00:34 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231
am:
dec80c416e
Change-Id: I0d45af12dda068eb9bf0bdcdceedb7f66429bca8
OSDN Git Service
