OSDN Git Service
Pulkit Bhuwalka [Wed, 15 Feb 2017 05:46:47 +0000 (21:46 -0800)]
Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.
Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.
Bug:
35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.
Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
Narayan Kamath [Fri, 17 Feb 2017 14:07:33 +0000 (14:07 +0000)]
Merge "zipalign: remove support for adding members from gzip sources."
Treehugger Robot [Fri, 17 Feb 2017 03:34:00 +0000 (03:34 +0000)]
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
Colin Cross [Fri, 17 Feb 2017 00:41:26 +0000 (16:41 -0800)]
Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.
Test: manual
Bug:
34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
Narayan Kamath [Thu, 16 Feb 2017 10:53:09 +0000 (10:53 +0000)]
zipalign: remove support for adding members from gzip sources.
This was vestigial code and never actually called anywhere.
Test: make
Bug:
35246701
Change-Id: I9297ac5fa030d369946857414155450635b65410
Treehugger Robot [Wed, 15 Feb 2017 22:52:45 +0000 (22:52 +0000)]
Merge "Blacklist code for CFI."
Vishwath Mohan [Tue, 14 Feb 2017 15:55:37 +0000 (07:55 -0800)]
Blacklist code for CFI.
Adds the -fsanitize-blacklist option for CFI, using the built in
blacklist at external/compiler-rt/lib/cfi/cfi_blacklist.txt.
Also refactors the CFI cflags and ldflags into ../soong/cc/makevars.go
to ensure they're consistent across Soong and make projects.
Bug:
30227045
Test: ENABLE_CFI=true m -j40 builds and boots.
Test: The blacklist prevents runtime errors that otherwise occur.
Change-Id: I0c2801ed459a3b9adeb37daff3ca212564801259
Treehugger Robot [Wed, 15 Feb 2017 00:45:18 +0000 (00:45 +0000)]
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set"
Dan Willemsen [Wed, 15 Feb 2017 00:32:15 +0000 (00:32 +0000)]
Merge "Support Soong native coverage"
Treehugger Robot [Tue, 14 Feb 2017 02:06:01 +0000 (02:06 +0000)]
Merge "Improve installclean to catch more installed files"
Treehugger Robot [Tue, 14 Feb 2017 01:36:44 +0000 (01:36 +0000)]
Merge "Share *_OUT_TESTCASES environment variables with TF"
Colin Cross [Mon, 13 Feb 2017 22:38:27 +0000 (22:38 +0000)]
Merge "Don't build tests in normal builds"
Tao Bao [Mon, 13 Feb 2017 22:29:40 +0000 (22:29 +0000)]
Merge "releasetools: Fix a bug in ReviseStashSize()."
Dan Willemsen [Mon, 13 Feb 2017 21:41:43 +0000 (13:41 -0800)]
Fix init rc installation in vendor when LOCAL_MODULE_PATH is set
The init.rc path selection uses the same partition_tag detection to
select an installation partition. So make sure that we always set
partition_tag even if we've been given an explicit module path.
Bug:
35314904
Test: set proprietary: true to Soong module with an init rc, verify
that was the only change to build-aosp_arm64.ninja
Change-Id: Ic6ffd7a5177959db96a34a24896b242ee5b09e41
Simran Basi [Mon, 13 Feb 2017 21:46:48 +0000 (13:46 -0800)]
Share *_OUT_TESTCASES environment variables with TF
Instead of having test tools search the OUT_DIR for the
testcases folders (of which there can be multiple different
targets), let's have these variables become part of the runtime
environment after a developer has run lunch.
Bug:
35322559
Test: . build/envsetup.sh ; lunch ; printenv | grep TESTCASES
Change-Id: Ic4addc2b9727ff717b2e595b9be224650e2f1b1d
Dan Willemsen [Sat, 11 Feb 2017 00:44:10 +0000 (16:44 -0800)]
Improve installclean to catch more installed files
Remove more installation directories. This gets called in between each
incremental build on our build servers.
Bug:
35267243
Test: (m -j; m -j installclean; m -j) ensure no large recompiles
Change-Id: Ied6bea5cad05c1f5e98b1bd1a30fb28ff09df23b
Treehugger Robot [Mon, 13 Feb 2017 20:52:30 +0000 (20:52 +0000)]
Merge "fat16copy: Allow to copy files to an existing directory."
Vishwath Mohan [Mon, 13 Feb 2017 20:49:19 +0000 (20:49 +0000)]
Merge "Disble CFI for ARM32 processes."
Tao Bao [Mon, 13 Feb 2017 19:42:50 +0000 (11:42 -0800)]
releasetools: Fix a bug in ReviseStashSize().
We check the needed stash size in ReviseStashSize(), and may not
generate a stash command if it would exceed the max allowed size. This
CL fixes a bug when skipping a stash operation: we shouldn't update the
'stashes' map if a stash command won't be generated.
Bug:
35313668
Test: Successfully generate the package that was failing due to the bug.
Change-Id: If0a3a5fadda9b4a4edad66a2a5826b5f978400ae
Alex Deymo [Mon, 13 Feb 2017 16:01:34 +0000 (16:01 +0000)]
Merge "Include the LOCAL_REQUIRED_MODULES when packaging."
Alex Deymo [Tue, 31 Jan 2017 23:23:29 +0000 (15:23 -0800)]
fat16copy: Allow to copy files to an existing directory.
This patch re-uses existing directories when copying directories,
allowing to copy files to a directory previously created.
Bug:
34811400
Test: fat16copy.py fat.bin a/b/foo; fat16copy.py fat.bin c/d/foo
(cherry-picked from
0af24a27a8d0dc7e1782f36a5a9963021ff8b3f6)
Change-Id: I283184da18f3c4951d6c84aafa4185074791acd2
Simran Basi [Sat, 11 Feb 2017 00:18:18 +0000 (00:18 +0000)]
Merge "Update CleanSpec.mk for the common testcase directories."
Mathieu Chartier [Sat, 11 Feb 2017 00:05:02 +0000 (00:05 +0000)]
Merge "Add support for preopted app images"
Simran Basi [Fri, 10 Feb 2017 23:40:43 +0000 (15:40 -0800)]
Update CleanSpec.mk for the common testcase directories.
Fix an issue with incremental builds and the new common
testcase directories.
Bug: None
Test: Removed https://android-review.googlesource.com/#/c/234478/
then ran `m cts-platform-version-check` then reapplied the
change to verify the failure. Then applied this new change
to verify the problem was resolved.
Change-Id: I77529021e852af35571fb99537d87100010b47af
Mathieu Chartier [Thu, 9 Feb 2017 02:30:31 +0000 (18:30 -0800)]
Add support for preopted app images
Enable iff WITH_DEXPREOPT_APP_IMAGE is true.
Test: Clean + build with the flag on and off. Tested Sailfish
booting.
Bug:
34927277
(cherry picked from commit
e8ab2a71d7bff1047c3d0497feba6bdcc02b8277)
Change-Id: I63f98a85c69d99746b11bb6e85c23cf5e48910cf
Treehugger Robot [Fri, 10 Feb 2017 21:11:58 +0000 (21:11 +0000)]
Merge "Output *TS testcases to their own subdir in the common testcase folders."
Dan Willemsen [Fri, 10 Feb 2017 08:07:17 +0000 (00:07 -0800)]
Support Soong native coverage
Soong (or any other prebuilt) can provide a .gcnodir file using
LOCAL_PREBUILT_COVERAGE_ARCHIVE. Just like today, if one isn't provided
for static libraries, an empty one will be created for Make modules to
use.
Also fixes a problem I noticed including whole static libs having
coverage into static libs. It was trying to write to /WHOLE since
PRIVATE_INTERMEDIATES_DIR was not set.
Bug:
32749731
Test: See build/soong change for soong-side tests
Test: Enabled coverage of a soong static lib, then include it in a make
static lib with LOCAL_WHOLE_STATIC_LIBRARIES and ensure that the any
shared libraries using the make static lib get the embedded coverage
information.
Change-Id: I32762f099c9757074fec922ee4822f819c9ceaf5
Treehugger Robot [Fri, 10 Feb 2017 00:53:23 +0000 (00:53 +0000)]
Merge "Remove mk file parser variables that are no longer required by system/bt"
Treehugger Robot [Fri, 10 Feb 2017 00:14:45 +0000 (00:14 +0000)]
Merge "Sort clear_vars.mk again"
Dan Willemsen [Thu, 9 Feb 2017 22:28:22 +0000 (14:28 -0800)]
Sort clear_vars.mk again
Test: none
Change-Id: Id776e81977695c4b488f44b155f2c098d5f8b61a
Jack He [Thu, 9 Feb 2017 22:28:00 +0000 (14:28 -0800)]
Remove mk file parser variables that are no longer required by system/bt
* Removed BLUETOOTH_HCI_USE_MCT
* Removed BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
Bug:
35203653,
34951912
Test: Code compilation, no user visible effects
Change-Id: Ic575d3a0fac541da3e70543d0f144ea4792bc058
Treehugger Robot [Thu, 9 Feb 2017 05:42:39 +0000 (05:42 +0000)]
Merge "Fix "Nothing to be done" messages when launching soong_ui"
Dan Willemsen [Thu, 9 Feb 2017 03:50:16 +0000 (19:50 -0800)]
Fix "Nothing to be done" messages when launching soong_ui
When specifying multiple arguments to make, we were getting messages
about nothing to be done:
m -j USE_SOONG_UI=true checkbuild tests cts blueprint_tools
...
make: Nothing to be done for `tests'.
make: Nothing to be done for `cts'.
make: Nothing to be done for `blueprint_tools'.
Test: m -j USE_SOONG_UI=true blueprint_tools libc adb
Change-Id: Id448bf0e09736fcd92ba058aec7ce556f6f778a3
Vishwath Mohan [Wed, 8 Feb 2017 04:28:07 +0000 (20:28 -0800)]
Disble CFI for ARM32 processes.
This CL disables CFI for 32-bit ARM processes, which is broken due to
a compiler error in the most recent version of clang.
Bug:
35157333
Test: ENABLE_CFI=true m -j40 does not enable CFI for 32-bit processes
Change-Id: I6a6e1d14c8365da1056b4cbccad11ef2f15c70b2
Simran Basi [Wed, 8 Feb 2017 23:53:32 +0000 (15:53 -0800)]
Output *TS testcases to their own subdir in the common testcase folders.
Instead of dumping all *TS testcases into the common testcase
directory directly, place them all in their own subdirectory.
Bug:
35153177
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I22a768dba58d40be1e61885534fb813e7ff08c99
Treehugger Robot [Wed, 8 Feb 2017 19:21:13 +0000 (19:21 +0000)]
Merge "Output *TS testcases to common testcase folders."
Jayant Chowdhary [Wed, 8 Feb 2017 17:45:38 +0000 (17:45 +0000)]
Merge "Add RenderScript Toolchain information to Soong."
Tao Bao [Wed, 8 Feb 2017 05:46:06 +0000 (05:46 +0000)]
Merge "releasetools: Support generating downgrade A/B OTAs."
Simran Basi [Wed, 25 Jan 2017 23:11:55 +0000 (15:11 -0800)]
Output *TS testcases to common testcase folders.
Aggregates the different *TS testcases into two common folders,
one under each the host and product hierarchies.
Bug:
34715822
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I7d5201998ddcb011ecc687c272a0d0a36da248b7
Tao Bao [Tue, 7 Feb 2017 19:21:17 +0000 (11:21 -0800)]
releasetools: Support generating downgrade A/B OTAs.
We already support generating downgrade OTAs for non-A/B devices (with
mandatory data wipe), but we have missed the --downgrade flag in A/B OTA
path.
This CL factors out the function that writes the downgrade metadata, and
fixes the path for generating A/B OTAs.
Bug:
35094540
Test: Generate incrementals with --downgrade for A/B and non-A/B OTAs.
Change-Id: I30b9bf83e69e8aba3be666507681b555db6ab743
Tao Bao [Tue, 7 Feb 2017 04:16:20 +0000 (04:16 +0000)]
Merge "releasetools: Pack the offset/length for metadata."
Treehugger Robot [Tue, 7 Feb 2017 02:14:15 +0000 (02:14 +0000)]
Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode"
Dan Willemsen [Tue, 6 Sep 2016 20:19:14 +0000 (13:19 -0700)]
Add USE_SOONG_UI to trigger soong_ui in Make mode
Test: USE_SOONG_UI=true m -j
Change-Id: Ic7a0b4e0881757b0324722d7d316fb8d13dabd9b
Colin Cross [Mon, 6 Feb 2017 21:19:21 +0000 (21:19 +0000)]
Merge "Create static archives in temporary file"
Treehugger Robot [Mon, 6 Feb 2017 19:18:25 +0000 (19:18 +0000)]
Merge "Add c_std and cpp_std properties."
Paul Duffin [Mon, 6 Feb 2017 15:03:14 +0000 (15:03 +0000)]
Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES""
Paul Duffin [Mon, 6 Feb 2017 14:58:02 +0000 (14:58 +0000)]
Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
This reverts commit
01fc887a07ed8d07f6e7cd75a812b90956543338.
A number of build breakages occurred which were not caused by presubmit checks.
Change-Id: I1351dba594c8a8b210416f75a67c68554d5b9372
Paul Duffin [Mon, 6 Feb 2017 12:55:20 +0000 (12:55 +0000)]
Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
Tao Bao [Mon, 6 Feb 2017 03:32:27 +0000 (03:32 +0000)]
Merge "releasetools: Fix the bug when generating care_map.txt."
Tao Bao [Sun, 5 Feb 2017 20:47:17 +0000 (12:47 -0800)]
releasetools: Fix the bug when generating care_map.txt.
Commit
f1a13180dba9c0145ac7bec8371340ae303c81c1 intended to remove the
verity blocks from care_map.txt, but it added new code without removing
the old one. This leads to a malformed care_map.txt and causes
update_verifier failure.
Bug:
34391662
Test: 'm -j dist' gives a TF.zip with 4-line META/care_map.txt (as
opposed to a 6-line file).
Change-Id: I7ff1aa525795c4b049af54c1755b0f0ea84f7e0e
Tao Bao [Sat, 4 Feb 2017 00:49:39 +0000 (16:49 -0800)]
releasetools: Pack the offset/length for metadata.
For streaming OTAs, we will also need the info in the metadata entry
(META-INF/com/android/metadata). Compute and pack its offset/length
values into 'ota-streaming-property-files'.
Bug:
34986195
Test: Create an OTA package and check the offset/length values.
Change-Id: Id150700f2bc9bff02467cda9fe8927c8a374412a
Dan Albert [Sat, 4 Feb 2017 00:16:11 +0000 (16:16 -0800)]
Add c_std and cpp_std properties.
Test: Checked showcommands ouput for each setting.
Bug: None
Change-Id: Ibc25f3977eaaecfd1fb99a27c9e15acae0ec4106
Evgenii Stepanov [Sat, 4 Feb 2017 00:04:21 +0000 (00:04 +0000)]
Merge "Disable CFI on Mips and add -march to linkflags on ARM."
Colin Cross [Fri, 3 Feb 2017 23:10:05 +0000 (15:10 -0800)]
Create static archives in temporary file
Creating static archives is often a multi-command process due to
adding whole static libraires or hitting command line length limits.
If one of the intermediate commands fails, the output file may
already exist. Unlike make, ninja has no option to delete output
files on failed builds, instead assuming all build commands will
produce their output file atomically
(https://github.com/ninja-build/ninja/issues/1135).
Change the static library rules to generate to a temporary file
that is then atomically moved into place as the output file.
Test: m -j checkbuild tests cts
Change-Id: I4faf269f0c8e313c738154870a5aa0b4774a72bc
Tianjie Xu [Fri, 3 Feb 2017 21:50:06 +0000 (21:50 +0000)]
Merge "Remove verity blocks from care map"
Jayant Chowdhary [Fri, 3 Feb 2017 02:55:21 +0000 (18:55 -0800)]
Add RenderScript Toolchain information to Soong.
Test: make -j64 from top of the tree.
Change-Id: I230f8d1265a71344bba8883ee9bdf2de98fcd41f
Stephen Hines [Wed, 1 Feb 2017 21:25:01 +0000 (21:25 +0000)]
Merge "Switch to clang-
3688880."
Evgenii Stepanov [Wed, 1 Feb 2017 01:08:33 +0000 (17:08 -0800)]
Disable CFI on Mips and add -march to linkflags on ARM.
Mips toolchain does not have ld.gold.
ARM change is a workaround for LLVM r290384.
Bug:
33678192
Test: make ENABLE_CFI=1
Change-Id: I77a127e0b472d5da10bf45a2983527a714339cb8
Treehugger Robot [Wed, 1 Feb 2017 19:28:59 +0000 (19:28 +0000)]
Merge changes Idd6b24a1,I4323acdb
* changes:
Remove -host
Add libext2_misc to otatools package
Baligh Uddin [Mon, 30 Jan 2017 20:41:31 +0000 (12:41 -0800)]
Remove -host
Bug:
34689537
Change-Id: Idd6b24a14caa863857303633ba15bd3b41a3a624
(cherry picked from commit
b24470e9890fbbba5a56a88bba353191cb00700b)
Baligh Uddin [Mon, 30 Jan 2017 15:47:35 +0000 (07:47 -0800)]
Add libext2_misc to otatools package
Bug:
34689537
Change-Id: I4323acdbadb1c4c8faa6dbb17a79bce72c063407
(cherry picked from commit
3d1ce3a6400852eb9f3e687e6286f31b301fc766)
Tao Bao [Wed, 1 Feb 2017 16:46:09 +0000 (16:46 +0000)]
Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'."
Tao Bao [Tue, 31 Jan 2017 23:06:05 +0000 (15:06 -0800)]
releasetools: Prepend 'ota-' to 'streaming-property-files'.
'streaming-property-files' is a property related to the OTA package
itself. Prepend 'ota-' to make it consistent with others like
'ota-type' and 'ota-required-cache'.
Bug:
34852392
Test: Generate an A/B OTA package and check METADATA entry.
Change-Id: Ia681e6e19ff509e6da0d8718933b42aac997e1cf
Stephen Hines [Tue, 31 Jan 2017 20:12:55 +0000 (12:12 -0800)]
Switch to clang-
3688880.
Bug: http://b/
31532493
Test: Manual validation.
Change-Id: I7c415a1008c368a4b65bac2b5cd3ded3f4bb9de0
Treehugger Robot [Tue, 31 Jan 2017 06:17:19 +0000 (06:17 +0000)]
Merge "Fix symbol zip creation with OUT_DIR outside source"
Dan Willemsen [Tue, 31 Jan 2017 04:42:28 +0000 (20:42 -0800)]
Fix symbol zip creation with OUT_DIR outside source
Bug:
34818739
Test: OUT_DIR=/... m -j /.../aosp_arm64-symbols-eng.dwillemsen.zip
Change-Id: I1d0d3a9f70d3457a536dee6fc25f49a16c353ae8
Sandeep Patil [Mon, 30 Jan 2017 19:16:16 +0000 (19:16 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
Sandeep Patil [Tue, 27 Dec 2016 23:47:06 +0000 (15:47 -0800)]
SELinux: split property_contexts into platform and non-platform components.
Bug:
33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I1932684f600dd34d5136e72ac053fae13f0c3eba
Signed-off-by: Sandeep Patil <sspatil@google.com>
Treehugger Robot [Thu, 26 Jan 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Put back LLVM_PREBUILTS_BASE."
Chih-Hung Hsieh [Thu, 26 Jan 2017 18:23:54 +0000 (10:23 -0800)]
Put back LLVM_PREBUILTS_BASE.
Without this, WITH_TIDY is disabled because
PATH_TO_CLANG_TIDY uses LLVM_PREBUILTS_BASE.
Test: build with WITH_TIDY=1
Change-Id: I607ae45550f4574b3cee8e91c3d5b7eaa5f0a96c
Yifan Hong [Thu, 26 Jan 2017 18:18:19 +0000 (18:18 +0000)]
Merge "Add lshal to embedded.mk."
Yifan Hong [Thu, 26 Jan 2017 05:53:38 +0000 (21:53 -0800)]
Add lshal to embedded.mk.
Test: make -j64 and flash the device and
ensure that lshal is available on the device.
Bug:
34712252
Change-Id: If61047afb27f9da9f8825ce18e2dfc0b3dec10e2
Tao Bao [Thu, 26 Jan 2017 16:28:16 +0000 (16:28 +0000)]
Merge "Makefile: Pack libsparse-host.so into otatools.zip."
Tao Bao [Thu, 26 Jan 2017 16:16:57 +0000 (08:16 -0800)]
Makefile: Pack libsparse-host.so into otatools.zip.
delta_generator has a dependency on that.
Bug:
34731113
Bug:
34723547
Test: m otatools-package
Change-Id: I70752a8c283bf98cb6106d3999515d0fd01f43b2
Brian Carlstrom [Thu, 26 Jan 2017 08:05:34 +0000 (08:05 +0000)]
Merge "Revert "Switch to clang-
3625443.""
Stephen Hines [Thu, 26 Jan 2017 07:59:53 +0000 (07:59 +0000)]
Revert "Switch to clang-
3625443."
This reverts commit
296af27303646fc7cd9e59f63d968f8513b79a8f.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I524c2c89004c79352bf2be3727c7ddcceca9b2e7
Treehugger Robot [Thu, 26 Jan 2017 07:13:16 +0000 (07:13 +0000)]
Merge "Switch to clang-
3625443."
Tianjie Xu [Fri, 20 Jan 2017 01:39:30 +0000 (17:39 -0800)]
Remove verity blocks from care map
When reading /dev/block/dm-X, update_verifier isn't able to access the
verity meta blocks at the end of the system/vendor partition. So we need
to remove these block ranges from the care_map.
Bug:
34391662
Test: care_map generated successfully without verity meta blocks
Change-Id: Id57c602b7e5fd1b0c9d1e1fe5fcdd74e85b6b255
Tao Bao [Wed, 25 Jan 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
Treehugger Robot [Wed, 25 Jan 2017 07:15:07 +0000 (07:15 +0000)]
Merge "Prevent abuse of property overrides"
Tao Bao [Wed, 25 Jan 2017 06:10:49 +0000 (22:10 -0800)]
Revert "Revert "releasetools: Generate streamable A/B OTA packages.""
This reverts commit
ea4325baf8a673e869cac8981781cf57c4821cb5 to re-land
commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36. It fixes the bug when
handling a package without care_map.txt (e.g. dm-verity not enabled).
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.
We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.
payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.
Bug:
33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
entry in the metadata file.
Test: Generate an A/B OTA package on a device with dm-verity not enabled.
Change-Id: I3469c8b62385a1fc58b4fb82e3f9d4690aef52ba
Jaekyun Seok [Fri, 20 Jan 2017 04:17:12 +0000 (13:17 +0900)]
Prevent abuse of property overrides
To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.
- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
files.
Test: building succeeded on marlin-userdebug.
Bug:
34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
(cherry picked from commit
294286d95c7647c1c20c3537f065c21e85371695)
Tao Bao [Wed, 25 Jan 2017 01:45:44 +0000 (01:45 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
Tao Bao [Wed, 25 Jan 2017 01:41:13 +0000 (01:41 +0000)]
Revert "releasetools: Generate streamable A/B OTA packages."
This reverts commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36.
It has broken the builds that don't have care_map.txt entry.
Change-Id: I343455e66be5e79457968dfc2813c7c1c234b6dc
Tao Bao [Tue, 24 Jan 2017 23:55:52 +0000 (23:55 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:14:43 +0000 (22:14 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
Calin Juravle [Tue, 24 Jan 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
Evgenii Stepanov [Tue, 24 Jan 2017 20:52:25 +0000 (20:52 +0000)]
Merge "Force Thumb for CFI targets."
Evgenii Stepanov [Tue, 24 Jan 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
Hiroshi Yamauchi [Tue, 24 Jan 2017 19:08:44 +0000 (11:08 -0800)]
Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug:
34084559
Bug:
34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
Evgenii Stepanov [Tue, 24 Jan 2017 00:57:38 +0000 (16:57 -0800)]
Run $(AR) with LLVMgold.so plugin for CFI targets.
Bug:
34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1
Stephen Hines [Mon, 23 Jan 2017 23:03:55 +0000 (15:03 -0800)]
Switch to clang-
3625443.
Bug: http://b/
31532493
Test: Manual validation.
Change-Id: I0490b60c996052669fbfd545d7c3eed17fdd3547
Evgenii Stepanov [Fri, 20 Jan 2017 22:12:08 +0000 (14:12 -0800)]
Force Thumb for CFI targets.
Bug:
22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
Paul Duffin [Wed, 21 Dec 2016 10:08:48 +0000 (10:08 +0000)]
Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES
Bug:
30188076
Test: make checkbuild
Change-Id: I8cc9d4f7aad5d9c0fb0a52a5f5d430c6d28050ce
Tao Bao [Wed, 11 Jan 2017 19:57:10 +0000 (11:57 -0800)]
releasetools: Generate streamable A/B OTA packages.
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.
We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.
payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.
Bug:
33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
entry in the metadata file.
Change-Id: I04504e834eb36e18876c5f5a5a09289ee05c6f9a
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Treehugger Robot [Fri, 20 Jan 2017 00:59:41 +0000 (00:59 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
Vishwath Mohan [Thu, 19 Jan 2017 22:35:31 +0000 (14:35 -0800)]
Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.
Bug:
30227045
Bug:
22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
Treehugger Robot [Thu, 19 Jan 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Don't pass empty arguments to ninja"