Commit Graph

43543 Commits

Author SHA1 Message Date
Chenbo Feng
2b948a2259 Add bpfloader binary to system image
The bpfloader is a executable binary used by netd to load and attach
networking related bpf program at run time. It need to be flashed to
device when updating the system image. Currently this binary is only
used by devices with kernel version 4.9 or above.

Test: hikey boot and bpf program show up under sys/fs/bpf
Bug: 30950746
Change-Id: I3d14d270a04ea57319ad4292ff51b1cf933fc975
2018-02-09 15:17:22 -08:00
Tao Bao
cb73aed1f0 releasetools: Refactor the condition checking for using imgdiff.
In Transfer class, unbundle 'intact' with the monotonicity of the input
ranges. Negate the logic of 'intact', and thus rename it to 'trimmed'.
Move this property from an attribute of Transfer class as the one in
RangeSet.extra. 'trimmed' indicates whether the source / target ranges
have been modified after creating the Transfer() instance.

The logic that determines whether we can apply imgdiff has been
refactored and consolidated into BlockImageDiff.CanUseImgdiff(). Now
both of the two paths call this single copy, i.e. the one that detects
large APKs (before creating Transfer()'s), and the other that's about to
generate the patch for a given Transfer instance.

Bug: 68016761
Test: python -m unittest test_blockimgdiff
Test: Generate an incremental BBOTA package.
Change-Id: Id07195f63f1fa6c3af6e9091940d251cf09fa104
2018-02-09 12:46:01 -08:00
Dan Willemsen
5e81ce7c5b Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190 am: 22eb731606
am: ea121f2a9a

Change-Id: Ib5ccf90b64ff78cad702d7b91e8db51ec68d054a
2018-02-09 19:49:24 +00:00
Dan Willemsen
ea121f2a9a Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190
am: 22eb731606

Change-Id: Ibfa7d19f060c28bf3f44ca284275f2d6c7c7e904
2018-02-09 19:44:15 +00:00
Dan Willemsen
22eb731606 Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""
am: 2744cbf190

Change-Id: I276e0f9be16d88d4c39d1c4a5dd177cf5aae9f32
2018-02-09 19:38:38 +00:00
Dan Willemsen
2744cbf190 Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" 2018-02-09 19:22:13 +00:00
Dan Willemsen
30d6869faf Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"
This reverts commit df5d7da7d8.

Reason for revert: breaking builds

Bug: 72969557
Change-Id: I27aad65587933c3f760a89c541d27469c916abe8
2018-02-09 19:21:11 +00:00
Tom Cherry
330670267e Merge "Add compile time check that friendly AID names are < 32 characters" am: 9f25d873bf am: cfac68eb9c
am: af0a12eded

Change-Id: I18b590bd8dc5f7f755ff391c8fbc20c53d03632c
2018-02-09 19:05:42 +00:00
Tom Cherry
af0a12eded Merge "Add compile time check that friendly AID names are < 32 characters" am: 9f25d873bf
am: cfac68eb9c

Change-Id: I52c488b8fc0b6e42ef379b517cc816fc8e759738
2018-02-09 19:00:04 +00:00
Tom Cherry
cfac68eb9c Merge "Add compile time check that friendly AID names are < 32 characters"
am: 9f25d873bf

Change-Id: Iace2d0294a7ca5318d568614b021a13713a72a78
2018-02-09 18:53:56 +00:00
Colin Cross
de2d9195ff Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7 am: 7209b4066b
am: 3c508d0b3d

Change-Id: I73f796d5a53f57210f5fad53ca47bbe8af1e59f2
2018-02-09 18:51:06 +00:00
Tom Cherry
9f25d873bf Merge "Add compile time check that friendly AID names are < 32 characters" 2018-02-09 18:46:27 +00:00
Tom Cherry
ee0610e86c Add compile time check that friendly AID names are < 32 characters
There is an internal buffer in bionic for user/group names that is 32
characters long including the trailing null, so we must restrict the
length of these names during compile time.

Bug: 27999086
Test: Successfully compile a valid config.fs
Test: Fail to compile a config.fs with AID name > 31 characters
Change-Id: I7fe887c630dd4d1033b86a5d8332480eb3b0fa07
2018-02-09 18:46:13 +00:00
Tom Cherry
55d0104f1b Place TARGET_FS_CONFIG_GEN passwd/group files in /vendor/etc
These entries are vendor provided and belong on the /vendor partition.

Bug: 27999086
Test: end to end user/group check via config.fs and getpwnam, etc.
Change-Id: I9a5d56da594bf0d04de2b9ce7fd7d9a8151d4682
2018-02-09 10:44:52 -08:00
Colin Cross
3c508d0b3d Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7
am: 7209b4066b

Change-Id: If42879f1bca2c3f7ff34b57e2447ee2ce947cd70
2018-02-09 18:43:48 +00:00
Colin Cross
7209b4066b Merge "Move to-upper and to-lower to definitions.mk"
am: 74413198b7

Change-Id: Iac483f693df41e2aa3b9cec049be783979ee0fa4
2018-02-09 18:37:05 +00:00
Dan Willemsen
4ac191d6ae Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" am: 13d389ad16 am: 02a56631d9
am: c23ffd4a3a

Change-Id: I75a14f34d453feb6e0b7f149931178b41ced6546
2018-02-09 18:26:00 +00:00
Treehugger Robot
74413198b7 Merge "Move to-upper and to-lower to definitions.mk" 2018-02-09 18:20:23 +00:00
Dan Willemsen
c23ffd4a3a Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" am: 13d389ad16
am: 02a56631d9

Change-Id: I3f89c666b4d3e016cc87d98ebb5a8911210c624e
2018-02-09 18:19:56 +00:00
Dan Willemsen
02a56631d9 Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"
am: 13d389ad16

Change-Id: Ic6f02cc5bfde13242b7cff2734c3b4406d42d036
2018-02-09 18:14:15 +00:00
Dan Willemsen
13d389ad16 Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" 2018-02-09 18:00:11 +00:00
Victor Hsieh
06f66af4e3 Merge "Don't use the same temp directory to uncompress dex" am: 9963b1af06 am: 4adb37dc4e
am: 7850bb0060

Change-Id: I3c2cea2b79615189e909a82fa003dc2fd91419af
2018-02-09 07:44:19 +00:00
Victor Hsieh
7850bb0060 Merge "Don't use the same temp directory to uncompress dex" am: 9963b1af06
am: 4adb37dc4e

Change-Id: Ic56126482827d08a0869d30b839fb08eb410870e
2018-02-09 07:38:40 +00:00
Victor Hsieh
4adb37dc4e Merge "Don't use the same temp directory to uncompress dex"
am: 9963b1af06

Change-Id: I4d0ff831879c72fc28c7d89806dea385d21488f2
2018-02-09 07:34:04 +00:00
Nan Zhang
de7a7dd43e Merge "Fixed pdk build error for pi-release" am: 3c6eaad044 am: 6145a2a2db
am: 416cf2d661

Change-Id: Id82aa8af41043b0f732c65e55fc7733872533e52
2018-02-09 07:23:45 +00:00
Treehugger Robot
9963b1af06 Merge "Don't use the same temp directory to uncompress dex" 2018-02-09 07:22:24 +00:00
Nan Zhang
416cf2d661 Merge "Fixed pdk build error for pi-release" am: 3c6eaad044
am: 6145a2a2db

Change-Id: I94ee6638597c44cdc8f98b44d784482bca633394
2018-02-09 07:18:08 +00:00
Nan Zhang
6145a2a2db Merge "Fixed pdk build error for pi-release"
am: 3c6eaad044

Change-Id: Idedee5300c4aae1a5d8381e506d6b8b6be79dcd7
2018-02-09 07:12:30 +00:00
Treehugger Robot
3c6eaad044 Merge "Fixed pdk build error for pi-release" 2018-02-09 06:57:40 +00:00
TreeHugger Robot
b6d7f7cf95 Merge "Change the naming policy of system_$(VER)" 2018-02-09 00:56:11 +00:00
Colin Cross
86a596c711 Remove art targets from PARSE_TIME_MAKE_GOALS
The art targets don't check MAKECMDGOALS any more, remove them
from PARSE_TIME_MAKE_GOALS.

Bug: 26275726
Test: m clean-oat
Test: m test-art-host-run-test-dependencies
Change-Id: I75869495c91f142bf8eff681e6e764c9b0464031
2018-02-08 16:40:35 -08:00
Colin Cross
18fae7a32e Move to-upper and to-lower to definitions.mk
So they can be used by art/test/Android.run-test.mk.

Also remove the line wrapping, which was inserting extra characters
at the beginning of the result, and add a sanity check.

Bug: 26275726
Test: no change to out/build-hikey960-test-art.ninja
Change-Id: I35b54c258a1dc76bb1a8a758ec4a08915a2b226d
2018-02-08 16:03:17 -08:00
Dan Willemsen
df5d7da7d8 Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES
Packages would use proguard rules from their
LOCAL_STATIC_ANDROID_LIBRARIES, but other libraries wouldn't propagate
the rules from their LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 72969557
Test: m
Change-Id: I514af02627d78c48cf6cd08d4b3c17911c6bac2f
2018-02-08 15:31:02 -08:00
Nan Zhang
f12aec3ca2 Fixed pdk build error for pi-release
due to missing header.jar, build was broken with error:
"android_stubs_current_intermediates/classes-header.jar needed by
android-support-annotations_intermediates/classes-turbine.jar,
missing and no known rule to make it"

Bug: b/72961456
Test: after check-in, I will download platform.zip to built it again.
Change-Id: I32ac8d8713ca31d27de42f87bde72185609d270c
2018-02-08 14:14:32 -08:00
Victor Hsieh
7aecf33efd Don't use the same temp directory to uncompress dex
This was ok for apk because they are in different parent directory.

Test: marlin built
Bug: 63920015
Bug: 30972906
Change-Id: I5ed00824fda9e7e0a99c825402753c21a06ba6c5
2018-02-08 13:24:56 -08:00
Yi Kong
963369035e Merge "Compiler-rt libraries now use i386 instead of i686" am: b5751e4bd7 am: 2b6217ee17
am: 3b1315dbaa

Change-Id: If8968980b658fec51231c80be4b4763b6279f119
2018-02-08 09:37:10 +00:00
Yi Kong
3b1315dbaa Merge "Compiler-rt libraries now use i386 instead of i686" am: b5751e4bd7
am: 2b6217ee17

Change-Id: I2fb5e67a19a5ea46220ac443f0b72873a16cd704
2018-02-08 08:39:34 +00:00
Yi Kong
2b6217ee17 Merge "Compiler-rt libraries now use i386 instead of i686"
am: b5751e4bd7

Change-Id: Idfc02ac01c55d94bd844f1d18633ddf1b7eaa633
2018-02-08 08:34:48 +00:00
Yi Kong
b5751e4bd7 Merge "Compiler-rt libraries now use i386 instead of i686" 2018-02-08 08:21:54 +00:00
Justin Yun
e136d21ff8 Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"" am: 835e296ce1 am: 2c95415716
am: e5f2a716cb

Change-Id: I8b5b14434356e5d7ea56a325b4c5a61dcd0aae03
2018-02-08 08:18:16 +00:00
Justin Yun
e5f2a716cb Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"" am: 835e296ce1
am: 2c95415716

Change-Id: I4939741c4e72c0cc6714f2c071b9a2b28fe7bc8f
2018-02-08 07:48:01 +00:00
Justin Yun
2c95415716 Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION""
am: 835e296ce1

Change-Id: Icb6dd36054dea5be65c5f3dadd460b77a7a3d73d
2018-02-08 07:39:51 +00:00
Justin Yun
835e296ce1 Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"" 2018-02-08 07:26:51 +00:00
Sundong Ahn
8902f5505f Change the naming policy of system_$(VER)
The name of system_$(VER) prebuilt file in droiddoc.mk and
java_common.mk was changed to sdk_v$(LOCAL_SDK_VERSION). But
system_$(VER) in apidiff.mk is not changed, since apidiff.mk
file is not in AOSP. So this modify is added and the modify
for core_current is added.

Bug: 72031391
Test: build & run on taimen
Change-Id: Ie227f4c6911fc80484f12b3f1cfa6472cb605d4b
2018-02-08 16:16:27 +09:00
Justin Yun
fbcc2ad22e Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"
This reverts commit 69ae572779.

Reason for revert: Build breaks on aosp_car

Change-Id: I9c7f0eedf8ea8fb3b4e14dc2024dea376cc14093
2018-02-08 07:06:13 +00:00
Justin Yun
1cd7012024 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION" am: 1e6b7c553a am: 3a9118137b
am: 2076edbd93

Change-Id: I1506cb1f26ee4879d5fec53deea2cccd6c6df4fa
2018-02-08 06:47:59 +00:00
Justin Yun
2076edbd93 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION" am: 1e6b7c553a
am: 3a9118137b

Change-Id: Id046336a2054495899610b602b50f43871f49736
2018-02-08 06:12:51 +00:00
Tao Bao
f980e046e0 Merge "releasetools: RangeSet.monotonic is not an optional attribute." am: acb3cecc46 am: c6b824ba96
am: 93c09cb740

Change-Id: I87bd661a6ac967f30beb84fafcfc8bfc9bb6fe1a
2018-02-08 06:09:44 +00:00
Yi Kong
cbcf11cba0 Compiler-rt libraries now use i386 instead of i686
Since Clang-4579689, crt libraries use i386 instead of i686. Update the
hardcoded paths to the new names.

Bug: 72942266
Test: N/A
Change-Id: I24f8f5742ac2fecd374fdaa3be8a11f410d31cbf
2018-02-08 14:08:44 +08:00
Justin Yun
3a9118137b Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"
am: 1e6b7c553a

Change-Id: I6a7b774c725814c865662e5dfbd06de65a41e781
2018-02-08 06:06:40 +00:00