Commit Graph

41479 Commits

Author SHA1 Message Date
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 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 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
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
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 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
Jaekyun Seok c227ce7c25 Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of
partitions is supported. But the early-mount must be supported for full
treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be
set by default for full treble products.

Additionally this CL sets ro.vndk.version regardless of
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED.

Bug: 73078796
Test: tested with walleye
Change-Id: Icfe1b6957b55b0f9261d34d7e92db3dc5073cb58
2018-02-08 11:49:16 +09: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 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
Michael Wright 87163300c2 Revert "Correct some GSI settings to board makefile"
This reverts commit 6e96487968.

Reason for revert: build_test broken by this change.

Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
SzuWei Lin 0c6f675b62 Merge "Correct some GSI settings to board makefile"
am: 2f7f7ca1c0

Change-Id: I057fc2749ffcb131db04eb86c903e1b3836fe174
2018-02-07 09:10:35 +00:00
Treehugger Robot 2f7f7ca1c0 Merge "Correct some GSI settings to board makefile" 2018-02-07 09:02:40 +00:00
Sundong Ahn 3826e0c889 Merge "Change the naming policy of system_$(VER)"
am: 9f14cf2e49

Change-Id: I415beb7348054f6c9c626e435fd149f256ea8812
2018-02-07 06:32:52 +00:00
Treehugger Robot 9f14cf2e49 Merge "Change the naming policy of system_$(VER)" 2018-02-07 06:26:05 +00:00
Tao Bao b7d3649c14 Merge "releasetools: Support packaging secondary payload."
am: 67ba60029d

Change-Id: Ibfaae3cea310afbe2de85f04386880bcee127027
2018-02-07 05:35:44 +00:00
Tao Bao 67ba60029d Merge "releasetools: Support packaging secondary payload." 2018-02-07 05:24:46 +00:00
Sundong Ahn 7a02001fa9 Change the naming policy of system_$(VER)
The module name of system_$(VER) prebuilt file is system_sdk_v$(VER).
But this is inconsistent with sdk_v$(LOCAL_SDK_VERSION) in prebuilts/sdk.
So, system_sdk_v$(VER) is changed to sdk_vsystem_$(VER) to use the same
naming policy.

Bug: 72031391
Test: build
Change-Id: I379c0f9aa0de7407489eeec2b07ee7727e81d69d
2018-02-07 03:37:24 +00:00
Simran Basi 79a2a1e889 Merge "LOCAL_HOST_REQUIRED_MODULES support"
am: 9ffbc10126

Change-Id: I0156d9f49170011261b74006584d67462296b147
2018-02-07 02:27:07 +00:00
Isaac Chen f82423f012 Merge "Add ro.vendor.product.cpu.* to vendor/build.prop"
am: b943fb63bf

Change-Id: I3bb56e27d359425bfb220b2084a2741a10c87ea3
2018-02-07 02:19:31 +00:00
Treehugger Robot 9ffbc10126 Merge "LOCAL_HOST_REQUIRED_MODULES support" 2018-02-07 01:57:18 +00:00
Isaac Chen b943fb63bf Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" 2018-02-07 01:57:12 +00:00
Tao Bao fe97dbd4ce releasetools: RangeSet.monotonic is not an optional attribute.
'monotonic' has been non-optional since [1] (L-MR1). Fix the comment in
RangeSet.parse(), as well as the use in blockimgdiff.py.

[1] commit 8b72aefb5a.

Test: Generate an incremental BBOTA package.
Change-Id: I7f95231683473b4f0f07f9c83fccc0e36a1340cb
2018-02-06 16:00:52 -08:00
Jiyong Park d2e7e0d33d Merge "Support LOCAL_SDK_VERSION := core_current"
am: c82c0a81ec

Change-Id: I052e72eb70cc90dca123eaad92420742d6ccae0e
2018-02-06 23:10:44 +00:00
Dan Willemsen 0991eed377 Merge "Replace $(shell find | sort) with $(sort $(shell find))"
am: 9f573a420e

Change-Id: I7edbea157d2333d167be82922756cca11ddbae18
2018-02-06 22:39:57 +00:00
Treehugger Robot c82c0a81ec Merge "Support LOCAL_SDK_VERSION := core_current" 2018-02-06 22:37:16 +00:00
Simran Basi 893098b06c LOCAL_HOST_REQUIRED_MODULES support
Allows target modules to directly request host modules they
require to be built and installed as well.

Bug: 72761631
Test: Added LOCAL_HOST_REQUIRED_MODULES to a target apk test and
      the host module was built.

Change-Id: I5aca11b3ba8b54676f068d337f1c9ba0e0b01997
2018-02-06 14:18:45 -08:00
Treehugger Robot 9f573a420e Merge "Replace $(shell find | sort) with $(sort $(shell find))" 2018-02-06 21:21:08 +00:00
Stephen Hines 9144cd3fe6 Merge "Switch to clang-4579689."
am: f733f896d3

Change-Id: I33624821fa84d1b0411901bc717c39087c40ab7e
2018-02-06 18:53:22 +00:00
Stephen Hines f733f896d3 Merge "Switch to clang-4579689." 2018-02-06 18:35:41 +00:00
Tao Bao 1f49ccfd61 Merge "releasetools: Capture stderr output when calling delta_generator."
am: 26fc64da06

Change-Id: Ie31820c3fc46aa3dba3053d330f885fd7d9953aa
2018-02-06 17:26:53 +00:00
Tao Bao 26fc64da06 Merge "releasetools: Capture stderr output when calling delta_generator." 2018-02-06 17:20:53 +00:00
James Lemieux 815658efe9 Merge "Clear local robolectric testing variables"
am: 08ba09ed7f

Change-Id: I3ea21d918c8622afa7ef0f22fa3caaa9743d6c08
2018-02-06 17:01:23 +00:00
Treehugger Robot 08ba09ed7f Merge "Clear local robolectric testing variables" 2018-02-06 16:55:09 +00:00
hansson bd5bb92f81 Merge "Add a base makefile for 64 bit only builds."
am: ee00360292

Change-Id: If7498714a3c669278224fef295c99c6e0ef37d32
2018-02-06 10:15:39 +00:00
hansson ee00360292 Merge "Add a base makefile for 64 bit only builds." 2018-02-06 10:08:48 +00:00
Tao Bao 3f15ada51b releasetools: Capture stderr output when calling delta_generator.
Prior to this CL, the call to delta_generator in
check_ota_package_signature.VerifyAbOtaPayload() didn't redirect stderr.
The logs (mostly INFO) on successful verification added noise to the
normal output, which also upset the unittest result parser.

This CL captures stderr outputs from delta_generator, and will only dump
them on error.

Bug: 72884343
Test: `python -m unittest -v test_ota_from_target_files > /dev/null`
      gives clean output.
Test: Inject error into delta_generator. The call to
      check_ota_package_signature correctly dumps both of stdout and
      stderr outputs.
Change-Id: I014a4b21bf758dcf0a4b9963259d6019851935ee
2018-02-05 23:39:23 -08:00
Dan Willemsen be0b6cee4f Replace $(shell find | sort) with $(sort $(shell find))
Kati's find emulator doesn't understand "| sort", so use use the make
function instead so that we can emulate the find commands.

 before: *kati*: shell time (regen): 1.316989 / 187
 after:  *kati*: shell time (regen): 1.249748 / 184

The time has a lot of variance, the important change is the reduction in
number of shell commands. Kati has other issues with some of these (it
doesn't support find's implicit -a), which is why it only goes down by
3. I'll be fixing Kati separately to handle those cases.

Test: diff out/build-aosp_taimen.ninja before&after
Change-Id: I5c8c2993f01a8a6af84963e903a8a0c186a61e82
2018-02-05 23:07:58 -08:00
Yifan Hong 9bf93017d4 core/config.mk: Add PLATFORM_SEPOLICY_COMPAT_VERSIONS
This is a list of sepolicy versions that the framework supports.

Test: build framework compatibility matrix
Test: boots

Bug: 67920434
Change-Id: I82365742172b653eadb7b5315398e06cace4e000
2018-02-05 15:55:11 -08:00
Yifan Hong 8f4547cde9 Move PLATFORM_SEPOLICY_VERSION from system/sepolicy/Android.mk
Test: builds
Bug: 67920434
Change-Id: I3b29fd188e755039a1fcf4814c578a2220567bf1
2018-02-05 15:55:11 -08:00
James Lemieux bb426739ce Clear local robolectric testing variables
This prevents them from mistakenly bleeding between test targets.

Bug: 72384841
Test: make Run_TeleService_robotests
Change-Id: Ie2c047be1450420f8e27b8b45e9416e96b477b45
2018-02-05 15:39:18 -08:00
Yifan Hong 6e79817411 Merge "Move system manifest / device matrix build rules"
am: fe34c5b52c

Change-Id: If9873f37745d4f1ea4c567d9774c64b5e37a4dcd
2018-02-05 23:37:16 +00:00
Tao Bao 8a05f343c2 Merge "releasetools: Fix an issue with pubkey extraction."
am: ca2ffed06c

Change-Id: Ibd9014ec04e26e018fcb4602a42b204941af13b6
2018-02-05 23:35:38 +00:00