Commit Graph

43076 Commits

Author SHA1 Message Date
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 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
Treehugger Robot 1e6b7c553a Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION" 2018-02-08 05:54:16 +00:00
Justin Yun 69ae572779 PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION
If PRODUCT_TREBLE_LINKER_NAMESPACES is not true when
BOARD_VNDK_VERSION is defined, report a build error.
To enable VNDK, linker namespace must be configured.

Bug: 72704254
Test: Try to build with one of them is missing
Change-Id: I804704e2f48fa44c8f998183508741d5cc40e4ce
2018-02-08 05:53:48 +00:00
Tao Bao 93c09cb740 Merge "releasetools: RangeSet.monotonic is not an optional attribute." am: acb3cecc46
am: c6b824ba96

Change-Id: I58685e0b462964078147c5bc906d52d11d74668c
2018-02-08 05:17:24 +00:00
Tao Bao c6b824ba96 Merge "releasetools: RangeSet.monotonic is not an optional attribute."
am: acb3cecc46

Change-Id: I951e696e4b032121a2d278ae82bc35a64cb845a3
2018-02-08 05:00:44 +00:00
Tao Bao acb3cecc46 Merge "releasetools: RangeSet.monotonic is not an optional attribute." 2018-02-08 04:45:44 +00:00
Yifan Hong dff13526f4 Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e am: 832c80d05b
am: 95a7d377a3

Change-Id: Ib574e20fceed10feadc96e7768355b024bf8a368
2018-02-07 23:21:30 +00:00
Yifan Hong 95a7d377a3 Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e
am: 832c80d05b

Change-Id: I0878571a42e9d49d673d3b2ca257c64793e3b5a8
2018-02-07 22:53:32 +00:00
Yifan Hong 832c80d05b Merge changes from topic "vintf_matrix_sepolicy"
am: 058d6c2d1e

Change-Id: I80eebbbd9b5339f4b3b622b5e932462f167505ac
2018-02-07 22:42:16 +00:00
Treehugger Robot 058d6c2d1e Merge changes from topic "vintf_matrix_sepolicy"
* changes:
  core/config.mk: Add PLATFORM_SEPOLICY_COMPAT_VERSIONS
  Move PLATFORM_SEPOLICY_VERSION from system/sepolicy/Android.mk
2018-02-07 22:32:44 +00:00
Michael Wright 74e5ccb28b Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036 am: e869d4e158
am: 80a013a7e2

Change-Id: I30ffb6bc51f7e41c5a90472d078ba8f47384402e
2018-02-07 15:25:19 +00:00
Michael Wright 80a013a7e2 Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
am: e869d4e158

Change-Id: I690d03dbee97f97fb98e67f403dce7654f3d0810
2018-02-07 15:19:44 +00:00
Michael Wright e869d4e158 Merge "Revert "Correct some GSI settings to board makefile""
am: 0b733a2036

Change-Id: Ic65bb3e53edfa015d62fe09aa318b036aa5e106a
2018-02-07 15:15:05 +00:00
Michael Wright 0b733a2036 Merge "Revert "Correct some GSI settings to board makefile"" 2018-02-07 15:11:07 +00:00