Commit graph

32800 commits

Author SHA1 Message Date
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
Hiroshi Yamauchi
64594c4f53 Add ART_USE_READ_BARRIER to product variables.
Bug: 33492005
Test: top-level build for angler.
Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8
2016-12-19 16:25:00 -08:00
Tao Bao
2137170e03 Merge "blockimgdiff.py: Add a test case for ReviseStashSize()." am: f967849693
am: a10cd259fc

Change-Id: Ib8102e58f5c5df97550aa200a392ff4e0d567f00
2016-12-19 21:25:46 +00:00
Tao Bao
a10cd259fc Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."
am: f967849693

Change-Id: Ibb1ffeb5c5e13578b4669c5525d270c4f3b7175d
2016-12-19 21:22:45 +00:00
Tao Bao
f967849693 Merge "blockimgdiff.py: Add a test case for ReviseStashSize()." 2016-12-19 21:15:18 +00:00
Tao Bao
304ee27e88 blockimgdiff.py: Add a test case for ReviseStashSize().
Bug: 33687949
Test: python -m unittest test_blockimgdiff
Change-Id: I31e42648d2c0e60b941908c098ce5ccc967861ca
2016-12-19 11:17:12 -08:00
Daniel Cashman
6549a83888 Merge "Revert "Add build dependencies for split sepolicy files."" am: cbdc0bd096
am: 5e8be7b822

Change-Id: I6b1e6db6a505f8a65879228dc8fa9b1863724ca1
2016-12-17 01:16:42 +00:00
Daniel Cashman
5e8be7b822 Merge "Revert "Add build dependencies for split sepolicy files.""
am: cbdc0bd096

Change-Id: Ie73ea2b943a153422e0373ef291f7306747e5420
2016-12-17 01:08:18 +00:00
Daniel Cashman
cbdc0bd096 Merge "Revert "Add build dependencies for split sepolicy files."" 2016-12-17 00:59:43 +00:00
Daniel Cashman
df1e2102c6 Revert "Add build dependencies for split sepolicy files."
This reverts commit 086189145c.

Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
2016-12-17 00:53:52 +00:00
dcashman
ced437a479 Merge "Add build dependencies for split sepolicy files." am: 298f9b5925
am: bc1832f381

Change-Id: Ic0a40500003afdd54e1a68cfec2937ae0f2aee06
2016-12-17 00:32:40 +00:00
dcashman
bc1832f381 Merge "Add build dependencies for split sepolicy files."
am: 298f9b5925

Change-Id: I8e8ef53b98d4341deab6f5ddb54cac6f30329e9c
2016-12-17 00:23:38 +00:00
Treehugger Robot
298f9b5925 Merge "Add build dependencies for split sepolicy files." 2016-12-17 00:17:13 +00:00
Tao Bao
b317d1c6ec Merge "releasetools: Fix the computation in ReviseStashSize()." am: 9cc98767ad
am: bf32e87669

Change-Id: I505288a01a652337a8290ee148959b24a0d79ea4
2016-12-17 00:15:05 +00:00
Tao Bao
bf32e87669 Merge "releasetools: Fix the computation in ReviseStashSize()."
am: 9cc98767ad

Change-Id: I2fbadc053c017b3a52cc2856f9b86511b8cb6a44
2016-12-17 00:07:34 +00:00
Tao Bao
9cc98767ad Merge "releasetools: Fix the computation in ReviseStashSize()." 2016-12-16 23:57:40 +00:00
dcashman
086189145c 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
2016-12-16 14:01:29 -08:00
Joe LaPenna
e07d894eb5 Merge "Add default NetworkRecommendation to core.mk" am: 95f616b960
am: f4251ee777

Change-Id: I95ab94b579c4e72f685bcfc2d7b68127dbc060e8
2016-12-16 20:43:06 +00:00
Joe LaPenna
f4251ee777 Merge "Add default NetworkRecommendation to core.mk"
am: 95f616b960

Change-Id: Ice21caa64e01e15911d9f5979cd0db345e5686f1
2016-12-16 20:35:04 +00:00
Treehugger Robot
95f616b960 Merge "Add default NetworkRecommendation to core.mk" 2016-12-16 20:23:48 +00:00
Tao Bao
e27acfdc41 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
2016-12-16 11:26:05 -08:00
Joe LaPenna
fa77432e6f 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
2016-12-16 10:48:47 -08:00
Alex Klyubin
bf78cdd81e Merge "aapt no longer needed for signing APKs" am: 3cfff7386f
am: 2c70770e93

Change-Id: I920311adea1085830df6ed992711e26aed38c2a1
2016-12-16 17:38:53 +00:00
Alex Klyubin
176a27a7a2 Merge "Remove unused get-package-min-sdk-version-int" am: 5a1ba84c30
am: 24b383a770

Change-Id: Iafe2ea0495e9c1b5c77eb4d995101c60e85700af
2016-12-16 17:38:40 +00:00
Alex Klyubin
2c70770e93 Merge "aapt no longer needed for signing APKs"
am: 3cfff7386f

Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533
2016-12-16 17:30:23 +00:00
Alex Klyubin
24b383a770 Merge "Remove unused get-package-min-sdk-version-int"
am: 5a1ba84c30

Change-Id: Id5b5c1a36f6fe6ef85f9cee12a7e49dacd416801
2016-12-16 17:30:09 +00:00
Alex Klyubin
3cfff7386f Merge "aapt no longer needed for signing APKs" 2016-12-16 17:21:13 +00:00
Alex Klyubin
5a1ba84c30 Merge "Remove unused get-package-min-sdk-version-int" 2016-12-16 17:20:23 +00:00
Vijay Venkatraman
94e6045271 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
2016-12-16 02:26:34 +00:00
Vijay Venkatraman
f880ab9021 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
2016-12-16 02:26:19 +00:00
Vijay Venkatraman
fe371b310f 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
2016-12-16 02:17:48 +00:00
Vijay Venkatraman
e9709b4575 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
2016-12-16 02:17:47 +00:00
Vijay Venkatraman
e4be608d2f 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."" 2016-12-16 02:11:12 +00:00
Vijay Venkatraman
823172e209 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 2b6c204c73.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
2016-12-16 02:08:18 +00:00
Alex Klyubin
664cc31fd8 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 e185da21ca)
Test: make clean && make

Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
2016-12-15 16:37:37 -08:00
Alex Klyubin
1b391c002d 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
2016-12-15 16:37:21 -08:00
Vijay Venkatraman
d5c2437942 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
2016-12-15 23:02:47 +00:00
Vijay Venkatraman
a41a8d371c 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
2016-12-15 23:02:29 +00:00
Vijay Venkatraman
fe9ba5edf4 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
2016-12-15 21:37:30 +00:00
Vijay Venkatraman
23da9097fe 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
2016-12-15 21:37:29 +00:00
Vijay Venkatraman
b777f169f8 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." 2016-12-15 21:26:16 +00:00
dcashman
81fcb95744 Merge "Split mac_permissions.xml into plat and non-plat components." am: b8888197c6
am: 63a91e9ee0

Change-Id: I3f1600730dc239093fa525c854a903d583510c12
2016-12-15 20:40:16 +00:00
dcashman
eb7c416fc2 Split mac_permissions.xml into plat and non-plat components. am: 15171f641e
am: f976eae6f3

Change-Id: I09424929985bfeff10c14853e89af2ae8ac9f9e8
2016-12-15 20:40:10 +00:00
dcashman
63a91e9ee0 Merge "Split mac_permissions.xml into plat and non-plat components."
am: b8888197c6

Change-Id: Id0785ec8105d31cb8dd21780be3552588c4ce9e8
2016-12-15 20:27:32 +00:00