OSDN Git Service
Hiroshi Yamauchi [Tue, 20 Dec 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Add ART_USE_READ_BARRIER to product variables."
Hiroshi Yamauchi [Fri, 16 Dec 2016 00:00:41 +0000 (16:00 -0800)]
Add ART_USE_READ_BARRIER to product variables.
Bug:
33492005
Test: top-level build for angler.
Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8
Tao Bao [Mon, 19 Dec 2016 21:15:17 +0000 (21:15 +0000)]
Merge "blockimgdiff.py: Add a test case for ReviseStashSize()."
Tao Bao [Mon, 19 Dec 2016 19:01:38 +0000 (11:01 -0800)]
blockimgdiff.py: Add a test case for ReviseStashSize().
Bug:
33687949
Test: python -m unittest test_blockimgdiff
Change-Id: I31e42648d2c0e60b941908c098ce5ccc967861ca
Daniel Cashman [Sat, 17 Dec 2016 00:59:42 +0000 (00:59 +0000)]
Merge "Revert "Add build dependencies for split sepolicy files.""
Daniel Cashman [Sat, 17 Dec 2016 00:53:52 +0000 (00:53 +0000)]
Revert "Add build dependencies for split sepolicy files."
This reverts commit
086189145caa9b154d02aa3a888a8815bb60a0d5.
Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
Treehugger Robot [Sat, 17 Dec 2016 00:17:12 +0000 (00:17 +0000)]
Merge "Add build dependencies for split sepolicy files."
Tao Bao [Fri, 16 Dec 2016 23:57:40 +0000 (23:57 +0000)]
Merge "releasetools: Fix the computation in ReviseStashSize()."
dcashman [Mon, 28 Nov 2016 15:19:35 +0000 (07:19 -0800)]
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
Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Add default NetworkRecommendation to core.mk"
Tao Bao [Fri, 16 Dec 2016 19:13:55 +0000 (11:13 -0800)]
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
Joe LaPenna [Thu, 8 Dec 2016 00:06:43 +0000 (16:06 -0800)]
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
Alex Klyubin [Fri, 16 Dec 2016 17:21:13 +0000 (17:21 +0000)]
Merge "aapt no longer needed for signing APKs"
Alex Klyubin [Fri, 16 Dec 2016 17:20:23 +0000 (17:20 +0000)]
Merge "Remove unused get-package-min-sdk-version-int"
Vijay Venkatraman [Fri, 16 Dec 2016 02:11:11 +0000 (02:11 +0000)]
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.""
Vijay Venkatraman [Fri, 16 Dec 2016 02:08:18 +0000 (02:08 +0000)]
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
2b6c204c73b97147ec00484904ee6f4bc003cb15.
Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
Alex Klyubin [Thu, 15 Dec 2016 20:53:58 +0000 (12:53 -0800)]
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
e185da21ca07006c5ced90e1577c0682566428de)
Test: make clean && make
Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
Alex Klyubin [Thu, 15 Dec 2016 20:51:25 +0000 (12:51 -0800)]
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
Vijay Venkatraman [Thu, 15 Dec 2016 21:26:16 +0000 (21:26 +0000)]
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."
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
dcashman [Wed, 14 Dec 2016 21:48:48 +0000 (13:48 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
Treehugger Robot [Thu, 15 Dec 2016 07:19:03 +0000 (07:19 +0000)]
Merge "Remove variables exported by Soong"
Treehugger Robot [Thu, 15 Dec 2016 07:01:12 +0000 (07:01 +0000)]
Merge "Don't clean generated java sources when AIDL list changes"
Dan Willemsen [Thu, 15 Dec 2016 03:53:54 +0000 (19:53 -0800)]
Don't clean generated java sources when AIDL list changes
AIDL doesn't generate into the intermediate src directory, we pass exact
aidl->java files to the compiler. So there is no need to clean the
intermediate src directory when the aidl file list changes for a module.
Test: None, just code inspection
Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6
Dan Willemsen [Thu, 15 Dec 2016 00:30:03 +0000 (00:30 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
Dan Willemsen [Wed, 14 Dec 2016 23:54:01 +0000 (15:54 -0800)]
Remove variables exported by Soong
LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading. LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.
Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.
Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
Alex Klyubin [Wed, 14 Dec 2016 23:42:13 +0000 (23:42 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion"
Alex Klyubin [Tue, 13 Dec 2016 02:19:17 +0000 (18:19 -0800)]
Faster auto-detection of APK's minSdkVersion
Prior to this change, when signing APKs, the build system invoked
'aapt dump badging' on each APK, to detect the value to pass into
signapk as --min-sdk-version. Now that signapk uses the apksig
library, it can auto-detect that value on its own, thus avoiding the
need to invoke 'aapt dump badging' and thus speeding up the build
process.
The semantics of signapk's --min-sdk-version flag is changed by this
commit from having the default value of 0 to having the default value
of "auto-detect from APK".
P.S. The get-package-min-sdk-version-int is not removed from
core/definitions.mk in this commnit, because this function is used in
another project's .mk file and thus that .mk file needs to be modified
first.
Test: rm -Rf out/ && make
Change-Id: I0972fcf0abbde9cbf6794e6c05c743c77c8a78f9
Treehugger Robot [Wed, 14 Dec 2016 20:53:02 +0000 (20:53 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints."
Tao Bao [Wed, 14 Dec 2016 19:53:38 +0000 (11:53 -0800)]
releasetools: Add prefix when dumping fingerprints.
We used to dump "Source: <fingerprint>" in update logs. The "Source: "
prefix was unintentionally dropped out.
Test: Check the generated incremental BBOTA script.
Change-Id: I4de62333aa38e3fb09a76df0e769b62af48e0313
Treehugger Robot [Wed, 14 Dec 2016 03:52:31 +0000 (03:52 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests"
Dan Willemsen [Wed, 14 Dec 2016 02:28:33 +0000 (18:28 -0800)]
Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert
Soong only supports exporting include directories under the current
directory. So bring non-local directories up as a potential problem in
soong_to_convert.txt
Test: m -j $OUT/soong_to_convert.txt, inspect
Change-Id: I7a15b92e10a1d8b8d3496c6f0529a0d0824f301e
Dan Willemsen [Sat, 10 Dec 2016 00:05:09 +0000 (16:05 -0800)]
Implement LOCAL_TEST_DATA to ship data with tests
This can be used to ship source data as test artifacts next to native
tests. It works for both local builds and the test bundles using
package_modules.mk.
You just specify a file list relative to the local directory, and those
files will be copied next to the executable under
/data/nativetest*/<module>/...:
LOCAL_MODULE := mytest
LOCAL_TEST_DATA := data/file1 file2
/data/nativetest/mytest/mytest
/data/nativetest/mytest/data/file1
/data/nativetest/mytest/file2
If the data is in another directory, you may also specify a different
prefix for the source files:
LOCAL_TEST_DATA := external/skia:resources/f.xml
/data/nativetest/skia_test/resources/f.xml
And there's a new convenience macro to find a list of files in this
format:
LOCAL_TEST_DATA := $(call find-test-data-in-subdirs,external/skia,"*.xml",resources)
I'll expand this to native benchmarks and fuzz tests in a later change,
since they don't have their own module classes yet.
Bug:
30564705
Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continuous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Change-Id: Ic76a7b62e7f567f259c4ab1510ee97d26600ba9a
Dan Willemsen [Tue, 13 Dec 2016 22:22:58 +0000 (22:22 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier"
Dan Willemsen [Tue, 13 Dec 2016 00:52:57 +0000 (16:52 -0800)]
Sort and reorganize clear_vars.mk to make merges easier
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Merged-In: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Paul Duffin [Tue, 13 Dec 2016 09:34:17 +0000 (09:34 +0000)]
Merge "Use legacy-test instead of core-junit"
Elliott Hughes [Tue, 13 Dec 2016 04:23:48 +0000 (04:23 +0000)]
Merge "Revert "Merge changes from topic 'fsconfig-2'""
Elliott Hughes [Tue, 13 Dec 2016 01:28:44 +0000 (17:28 -0800)]
Revert "Merge changes from topic 'fsconfig-2'"
This reverts commit
1b2de51881e0ff76e2ad9d3d0405fc7185b0f86f, reversing
changes made to
77ea32f378651a3585e245eb964dab979d191310.
Treehugger Robot [Sat, 10 Dec 2016 07:14:11 +0000 (07:14 +0000)]
Merge "Fix PDK dupbuild issues"
Dan Willemsen [Sat, 10 Dec 2016 05:15:41 +0000 (21:15 -0800)]
Fix PDK dupbuild issues
The PDK uses pattern rules in order to install files from the PDK. When
those files already have build rules, the explicit rules override the
pattern rules, and everything works. But because Make (and Kati) doesn't
attempt to clean the file paths, if one of the rules has a redundant /,
we'll export two ninja rules, and ninja will error out with a dupbuild
error.
The PDK pattern rules are clean, but the explicit notice file creation
was not, it was always adding a double // in between NOTICE_FILES/src
and the module path.
Some modules were also setting a LOCAL_MODULE_PATH with a trailing /,
which is redundant, and also hits the above problem. Instead of fixing
all of the modules, just strip a trailing / from my_module_path.
Bug:
33451638
Test: Build with a PDK
Change-Id: Iff3e98fd191ea90626b9b89f179537e8a75f5ef2
Elliott Hughes [Sat, 10 Dec 2016 00:13:04 +0000 (00:13 +0000)]
Merge changes from topic 'fsconfig-2'
* changes:
fs_config: add unit tests
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
fs_config: add group to build
fs_config: introduce group generator
fs_config: add passwd to build
fs_config: introduce passwd generator
fs_config: generate friendly in AID class
fs_config: limit characters for AID_<name> sections
fs_config: generate oem AID header file
fs_config: android_id header generator
fs_config: support parsing android_filesystem_config.h
fs_config: modularize fs_config_generator
Treehugger Robot [Fri, 9 Dec 2016 22:54:59 +0000 (22:54 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64"
Colin Cross [Fri, 9 Dec 2016 21:08:27 +0000 (13:08 -0800)]
Add more module targets for host, host-cross, host32, host64
Previously, clang-host would build the clang module for 32-bit and
64-bit for the host and for windows. Make clang-host only compile
for host, and add clang-host-cross for windows. Also add targets
that only build 32-bit or 64-bit: clang-host32, clang-host64,
clang-host-cross32, clang-host-cross64, clang-target32, and
clang-target64.
Test: inspect build.ninja
Change-Id: I7676f9497dfc852f2a0255dda8da06c88eec0db8
Paul Duffin [Fri, 9 Dec 2016 15:21:45 +0000 (15:21 +0000)]
Use legacy-test instead of core-junit
The core-junit library has been replaced with the legacy-test
library. The latter included everything that was in core-junit
plus some android.test classes that were in frameworks.
Bug:
30188076
Test: make checkbuild
Change-Id: Id2ba827705dbd2c27a1183e1153b03c11a8a4074
Colin Cross [Thu, 8 Dec 2016 23:42:16 +0000 (23:42 +0000)]
Merge "Pass eng product varible to soong"
Colin Cross [Thu, 8 Dec 2016 18:05:55 +0000 (10:05 -0800)]
Pass eng product varible to soong
Test: mmma -j frameworks/compile/libbcc
Change-Id: I79a903528948b728f730385a9de5e431617ff257
Treehugger Robot [Wed, 7 Dec 2016 17:35:53 +0000 (17:35 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build"
Pat Tjin [Wed, 7 Dec 2016 07:07:25 +0000 (07:07 +0000)]
Merge "build_image: add support for specifying number of inodes"
Patrick Tjin [Thu, 20 Oct 2016 17:58:12 +0000 (10:58 -0700)]
build_image: add support for specifying number of inodes
Add support for specifying number of inodes when creating
system, vendor, oem partitions. These are all read-only
and have no use for extra inodes. Removing extra inodes
saves a lot of space.
Bug:
32246383
Change-Id: I13f1d4614b64a4abc752c42a1c65d3d151481c21
(cherry picked from commit
b59eca358603a4174d4f7c9b70749e7cd0e6f3fe)
Treehugger Robot [Wed, 7 Dec 2016 03:20:12 +0000 (03:20 +0000)]
Merge "custom_image: fix build break"
Andreas Gampe [Wed, 7 Dec 2016 01:56:29 +0000 (17:56 -0800)]
Build: Skip JNI lib symlink in second-stage build
When creating a sanitized image, skip creating JNI library
symlinks in the second round.
Bug:
33279120
Test: m && m SANITIZE_TARGET=address & ls -l $OUT/system/app/NfcNci/lib/*
Change-Id: Ib5eace9a49eb8b693603ba5cc59e392d575c44e3
Benoit Lamarche [Tue, 6 Dec 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Disable Jack's NNode cache"
am:
3c731228ba
Change-Id: Iea59e0c4cd0fa11277913d70a9de698565ae13fc
Benoit Lamarche [Tue, 6 Dec 2016 15:47:34 +0000 (15:47 +0000)]
Merge "Disable Jack's NNode cache"
Benoit Lamarche [Tue, 6 Dec 2016 14:00:03 +0000 (15:00 +0100)]
Disable Jack's NNode cache
Test: N/A
Bug:
33367537
Change-Id: Idf7a518dfcbf5665917465b1ae2f0e09f4532688
Benoit Lamarche [Tue, 6 Dec 2016 10:32:41 +0000 (11:32 +0100)]
resolve merge conflicts of
e04c941 to stage-aosp-master
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
Benoit Lamarche [Tue, 6 Dec 2016 10:16:25 +0000 (10:16 +0000)]
Merge "Set platform min sdk for Jack to o-b1"
bowgotsai [Tue, 6 Dec 2016 09:30:44 +0000 (17:30 +0800)]
custom_image: fix build break
Fix build break caused by
https://android-review.googlesource.com/#/c/305575/.
Bug:
33358681
Test: make custom_images
Change-Id: I1ba7cf61491c8593b20bdac58e984f1928697b8c
Dan Willemsen [Tue, 6 Dec 2016 03:32:05 +0000 (03:32 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
am:
47b0322534
Change-Id: I55ac26073caf34173f6c051f87e10b651c23589b
Treehugger Robot [Tue, 6 Dec 2016 03:27:00 +0000 (03:27 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
Dan Willemsen [Tue, 6 Dec 2016 02:32:30 +0000 (02:32 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
am:
bbc072f716
Change-Id: Ifba3b1ebb0e9ca018495fc1f93104823d51a516e
Treehugger Robot [Tue, 6 Dec 2016 02:28:35 +0000 (02:28 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
Dan Willemsen [Tue, 6 Dec 2016 02:25:36 +0000 (02:25 +0000)]
Merge "Soong now exports AIDL_CPP"
am:
06a2daac72
Change-Id: I704c568b71cd95c6a17545d6694095b72e5c097c
Treehugger Robot [Tue, 6 Dec 2016 02:20:39 +0000 (02:20 +0000)]
Merge "Soong now exports AIDL_CPP"
Vijay Venkatraman [Wed, 30 Nov 2016 19:13:43 +0000 (11:13 -0800)]
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.
Test: Any module that uses VNDK
Change-Id: Ic90b165ade8d9845595f371f410635cae6477d7c
Dan Willemsen [Tue, 6 Dec 2016 01:46:14 +0000 (17:46 -0800)]
Tell Soong about TARGET_COPY_OUT_VENDOR
So that it can properly install proprietary components in system/vendor/
or vendor/
Test: lunch aosp_arm-eng; m -j vulkan.default
Test: lunch aosp_flounder-eng; m -j vulkan.default
Change-Id: I98384d2b4f09c3b5de2ed04417880f366828234e
Dan Willemsen [Tue, 6 Dec 2016 00:38:14 +0000 (16:38 -0800)]
Remove aidl, proto, objc from soong_problems
We support these in Soong now, so stop marking them in soong_to_convert.
Test: Compare soong_to_convert.txt
Change-Id: I89befdfd8c4eaa04ab626d8be090765a1b879d8b
Dan Willemsen [Mon, 5 Dec 2016 23:16:38 +0000 (15:16 -0800)]
Soong now exports AIDL_CPP
So remove it here.
Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
The Android Automerger [Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master
* commit '
c13da91':
Add support for creating ext4 images with mke2fs
BUG:
33304034
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge "Add support for creating ext4 images with mke2fs"
dcashman [Fri, 2 Dec 2016 22:36:28 +0000 (22:36 +0000)]
Merge "Sort SELinux package inclusion."
am:
15e1b5e239
Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956
Treehugger Robot [Fri, 2 Dec 2016 22:25:42 +0000 (22:25 +0000)]
Merge "Sort SELinux package inclusion."
Colin Cross [Fri, 2 Dec 2016 22:00:26 +0000 (22:00 +0000)]
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
am:
1498712a6b
Change-Id: Iec7d58d837879bc4a63818d09881873f56d14779
Colin Cross [Fri, 2 Dec 2016 21:47:57 +0000 (21:47 +0000)]
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
dcashman [Fri, 2 Dec 2016 17:32:15 +0000 (09:32 -0800)]
Sort SELinux package inclusion.
This section will be modified as part of splitting these packages into platform
and non-platform components. Sort them all to avoid conflicts.
Bug:
31363362
Test: Builds
Change-Id: I91fb4d4d7c0a6971a19047ef2eb2981770a122ff
Tao Bao [Fri, 2 Dec 2016 15:19:00 +0000 (15:19 +0000)]
Merge "Build recovery-two-step.img for two-step OTAs."
am:
06e14e438f
Change-Id: I9c5d6e5f71da88bc0f662373335b024a55ca193e
Tao Bao [Fri, 2 Dec 2016 15:09:13 +0000 (15:09 +0000)]
Merge "Build recovery-two-step.img for two-step OTAs."
Yohann Roussel [Fri, 18 Nov 2016 18:30:28 +0000 (19:30 +0100)]
Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit
94acfe908b3e70cdd11920c92715ef06de7ed212)
Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
Tao Bao [Wed, 30 Nov 2016 20:11:57 +0000 (12:11 -0800)]
Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.
This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.
Here are the desired changes:
- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).
- <device>-img.zip should not contain 'recovery-two-step.img'.
- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.
- When building a two-step OTA with an input TF.zip that doesn't have
IMAGES/recovery-two-step.img, it should use the existing
IMAGES/recovery.img instead.
Bug:
32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
Pirama Arumuga Nainar [Thu, 1 Dec 2016 18:11:13 +0000 (18:11 +0000)]
Merge "Do not *directly* package libbcc.so"
am:
ec0d7cbc49
Change-Id: I15871b1ca4cb5fa5488721a5f6a21bfa2a72feab
Pirama Arumuga Nainar [Thu, 1 Dec 2016 17:58:46 +0000 (17:58 +0000)]
Merge "Do not *directly* package libbcc.so"
Tao Bao [Thu, 1 Dec 2016 17:09:07 +0000 (17:09 +0000)]
Merge "releasetools: Remove dead parameter in GetBootableImage()."
am:
8df4fea85f
Change-Id: I192af3927849d0d8f995f0002b8b8f2e191b794f
Tao Bao [Thu, 1 Dec 2016 17:02:06 +0000 (17:02 +0000)]
Merge "releasetools: Remove dead parameter in GetBootableImage()."
Paul Duffin [Thu, 1 Dec 2016 10:42:16 +0000 (10:42 +0000)]
Merge "Replace core-junit with legacy-test"
am:
32cc1f80e5
Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
Paul Duffin [Thu, 1 Dec 2016 10:34:07 +0000 (10:34 +0000)]
Merge "Replace core-junit with legacy-test"
Tao Bao [Thu, 1 Dec 2016 08:08:05 +0000 (00:08 -0800)]
releasetools: Remove dead parameter in GetBootableImage().
The 'system_img_path' parameter was introduced in commit
d995f4b04df46d9e9ac1be8d58ca961e94b783d1, but became obsolete since
commit
2ce63edab715ae4ff34e1a2ef240b05216f6ca5d.
Test: m dist
Change-Id: Iffd496d929db5cc3dfc955a48bfc1b1317bd012f
Andreas Gampe [Thu, 1 Dec 2016 02:48:21 +0000 (02:48 +0000)]
Merge changes from topic 'simplify_app_process_asan_modules'
am:
9a3bd76ab4
Change-Id: I07d79da80ce2fce035c87e768d12c1b136bf6fdd
Andreas Gampe [Thu, 1 Dec 2016 02:47:34 +0000 (02:47 +0000)]
Revert "Build: Add sanitized app_process"
am:
88d43677f5
Change-Id: I358a67f5e89bf72e7bba9d97a16d34d9a3e79afb
Andreas Gampe [Thu, 1 Dec 2016 02:47:29 +0000 (02:47 +0000)]
Revert "Build: Add asanwrapper in SANITIZE_LITE"
am:
4938f3300a
Change-Id: Ic3745664db0b89baaea8b98b79ead63a77e95440
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge changes from topic 'simplify_app_process_asan_modules'
* changes:
Revert "Build: Add sanitized app_process"
Revert "Build: Add asanwrapper in SANITIZE_LITE"
Andreas Gampe [Wed, 30 Nov 2016 23:38:43 +0000 (15:38 -0800)]
Revert "Build: Add sanitized app_process"
This reverts commit
a35d92e4312b2247b0a27e17a6f08f82dae49fdf.
The app_process__asan module is merged into app_process.
Bug:
33224213
Test: m
Change-Id: I5e3e836c67b5bd17cf967f1b2429e39c4e18557b
Andreas Gampe [Wed, 30 Nov 2016 23:38:31 +0000 (15:38 -0800)]
Revert "Build: Add asanwrapper in SANITIZE_LITE"
This reverts commit
eee31511f70398ada44c7f8811234311ce8c7a7f.
Rewriting of app_process adds an automatic dependency.
Bug:
33224213
Test: m
Change-Id: Idd9509d116692954224f4d2ffd6c81b69e9a85a3
Andreas Gampe [Thu, 1 Dec 2016 00:09:03 +0000 (00:09 +0000)]
Merge changes from topic 'app_process_sanitized_binaries'
am:
de24e6198e
Change-Id: Ie077774c7816e7bf19c4474e9fa36824e10d58d4
Andreas Gampe [Thu, 1 Dec 2016 00:06:26 +0000 (00:06 +0000)]
Build: Add asanwrapper in SANITIZE_LITE
am:
eee31511f7
Change-Id: I2fda3c98543296418b7c4741e8425f1ab35f7fb1
Andreas Gampe [Thu, 1 Dec 2016 00:06:20 +0000 (00:06 +0000)]
Build: Add sanitized app_process
am:
a35d92e431
Change-Id: Idc10fa334820dab5de1a697092e4c14fb6023425
Pirama Arumuga Nainar [Wed, 30 Nov 2016 23:40:43 +0000 (15:40 -0800)]
Do not *directly* package libbcc.so
Bug: http://b/
28866258
Remove libbcc.so from the list of directly packaged modules. 64-bit
libbcc.so gets included as a dependency for the bcc executable (which is
a required package). 32-bit libbcc.so is no longer necessary on 64-bit
devices.
This change also removes 32-bit libLLVM.so from a 64-bit system image
(leading to a 13M reduction in Angler's system image on AOSP) and a
considerable reduction in build time.
Test: - Build all topics in this CL
- RsTest (including the 32-bit ABI) and CTS tests pass on x86 and
x86_64 emulators and Angler.
Change-Id: I10f07e322a615f37d6967b7c938635f544ddceff
Treehugger Robot [Wed, 30 Nov 2016 21:00:55 +0000 (21:00 +0000)]
Merge changes from topic 'app_process_sanitized_binaries'
* changes:
Build: Add asanwrapper in SANITIZE_LITE
Build: Add sanitized app_process
Andreas Gampe [Wed, 30 Nov 2016 18:20:20 +0000 (10:20 -0800)]
Build: Add asanwrapper in SANITIZE_LITE
Add asanwrapper helper binary to PRODUCT_PACKAGES when building with
SANITIZE_LITE=true.
Bug:
33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asanwrapper
Change-Id: Ic4d8973b9e9ddfd9ef8663735bf5f70d8f9f70e1
Paul Duffin [Tue, 29 Nov 2016 12:15:13 +0000 (12:15 +0000)]
Replace core-junit with legacy-test
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases
Bug:
30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
William Roberts [Sat, 19 Nov 2016 00:12:41 +0000 (16:12 -0800)]
fs_config: add unit tests
Add some initial unit tests.
The unit tests themselves are inlined into the tool and
can be executed by running the "test" commandlet.
Example:
$ python -m unittest test_fs_config_generator.Tests
.............
----------------------------------------------------------------------
Ran 13 tests in 0.004s
OK
Test: run the test commandlet and observe for failures.
Change-Id: I1bada385fa841fd50fa958997d440f1198e15198
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Andreas Gampe [Wed, 30 Nov 2016 03:22:01 +0000 (19:22 -0800)]
Build: Add sanitized app_process
Add sanitized app_process module to PRODUCT_PACKAGES when building
with SANITIZE_LITE=true
Bug:
33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asan
Change-Id: Ic67976f1b897b638d569ec6f42d5a8d59f8a9285