OSDN Git Service
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
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
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
Andreas Gampe [Wed, 30 Nov 2016 00:48:39 +0000 (00:48 +0000)]
Merge "Revert "Build: Bring back SDK dependencies""
am:
2bbeae7f8a
Change-Id: I9560d6a8f9971db89c87499b2e177bd0bb921cff
Treehugger Robot [Wed, 30 Nov 2016 00:39:33 +0000 (00:39 +0000)]
Merge "Revert "Build: Bring back SDK dependencies""
Dan Willemsen [Tue, 29 Nov 2016 20:42:40 +0000 (20:42 +0000)]
Merge changes from topic 'basic_vndk'
am:
e69f15c9dc
Change-Id: Idf95a23c4b1341145f9e39364235413c82f659ac
Dan Willemsen [Tue, 29 Nov 2016 20:42:37 +0000 (20:42 +0000)]
Prohibit host modules from using LOCAL_COPY_HEADERS
am:
6e51ef61a7
Change-Id: Id7c80e4dba5a505a04ce47d459c0a525debc4d53
Dan Willemsen [Tue, 29 Nov 2016 20:42:32 +0000 (20:42 +0000)]
Add basic VNDK support in Make
am:
bab0fa6928
Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92
Dan Willemsen [Tue, 29 Nov 2016 20:42:26 +0000 (20:42 +0000)]
Remove GLOBAL_LD_DIRS
am:
e5836c4bb0
Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
Treehugger Robot [Tue, 29 Nov 2016 20:36:04 +0000 (20:36 +0000)]
Merge changes from topic 'basic_vndk'
* changes:
Prohibit host modules from using LOCAL_COPY_HEADERS
Add basic VNDK support in Make
Remove GLOBAL_LD_DIRS
Dan Willemsen [Wed, 23 Nov 2016 00:17:38 +0000 (16:17 -0800)]
Prohibit host modules from using LOCAL_COPY_HEADERS
There are no users left, so remove all of this.
Test: lunch aosp_arm-eng; m -j native
Test: build/tools/kati_all_products.sh on aosp and internal master
Change-Id: I32f5c8b470a43dd203d7e20c192167630e4e6888
Dan Willemsen [Fri, 18 Nov 2016 22:05:39 +0000 (14:05 -0800)]
Add basic VNDK support in Make
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.
If the board is using the VNDK:
* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
system/core/include, but it will use device-specific kernel headers.
This change does not attempt to enforce any linking constraints, that
will come in a later patch.
Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
Dan Willemsen [Tue, 22 Nov 2016 23:13:56 +0000 (15:13 -0800)]
Remove GLOBAL_LD_DIRS
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.
Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
Tao Bao [Mon, 28 Nov 2016 18:13:45 +0000 (18:13 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
am:
31543713fc
Change-Id: I94587dc4f80edd61d5d414742513c4360609259f
Tao Bao [Mon, 28 Nov 2016 18:13:43 +0000 (18:13 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7f02f3413b
Change-Id: Ib9c73dd16016b582dbaf2c40ebfc9b20c1adabe3
Tao Bao [Mon, 28 Nov 2016 18:04:04 +0000 (18:04 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
Ian Rogers [Tue, 22 Nov 2016 18:50:21 +0000 (18:50 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
am:
7ed3af23a8
Change-Id: Iae1dec6c0b48be23d874c01b9d87627bbf0c0caf
Ian Rogers [Tue, 22 Nov 2016 18:43:50 +0000 (18:43 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
Nick Glorioso [Tue, 15 Nov 2016 23:57:57 +0000 (15:57 -0800)]
Update warn.py for new Error Prone diagnostics
Test: Local build, tee'd to file, ran warn.py and checked output HTML
Change-Id: Iee3386e88c73e4b8e0a1fcc60105ee5fb86e3cb0
Dan Albert [Fri, 18 Nov 2016 19:09:36 +0000 (19:09 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
am:
c7d2fe614e
Change-Id: Ibf9a4ffa74f5d05f68bd34db908fe4e5a67fe173
Treehugger Robot [Fri, 18 Nov 2016 19:04:39 +0000 (19:04 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
Andreas Gampe [Fri, 18 Nov 2016 03:42:51 +0000 (19:42 -0800)]
Revert "Build: Bring back SDK dependencies"
This reverts commit
ff00c5d78faeacfaae1abc69d69d7cd8c0e9d3ff.
Test: m
Andreas Gampe [Fri, 18 Nov 2016 02:57:28 +0000 (02:57 +0000)]
Merge "Build: Bring back SDK dependencies"
am:
eb06c77b80
Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
Andreas Gampe [Fri, 18 Nov 2016 02:53:28 +0000 (02:53 +0000)]
Merge "Build: Bring back SDK dependencies"
Andreas Gampe [Fri, 18 Nov 2016 02:21:36 +0000 (18:21 -0800)]
Build: Bring back SDK dependencies
Temporarily re-add SDK dependencies to runtime_libart.mk.
Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
Andreas Gampe [Fri, 18 Nov 2016 01:32:20 +0000 (01:32 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
am:
020f5275d5
Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
Treehugger Robot [Fri, 18 Nov 2016 01:25:53 +0000 (01:25 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
William Roberts [Fri, 18 Nov 2016 00:57:15 +0000 (00:57 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
am:
052a01958c
Change-Id: If18ab459d74e20f96db56d80ecdbf94580583463
Treehugger Robot [Fri, 18 Nov 2016 00:29:52 +0000 (00:29 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
William Roberts [Thu, 17 Nov 2016 23:42:52 +0000 (23:42 +0000)]
Merge "fs_config: correct README"
am:
4baaf905ee
Change-Id: I1a3fa8a296608205a29efb94c32fbfd14d4844f2
Andreas Gampe [Thu, 17 Nov 2016 23:42:38 +0000 (23:42 +0000)]
Merge "Build: Add agent library to default packages"
am:
709aaa5aea
Change-Id: I61e55b948838d8845d04802e87d435ac8b9f9b3c
Treehugger Robot [Thu, 17 Nov 2016 23:30:50 +0000 (23:30 +0000)]
Merge "fs_config: correct README"
Treehugger Robot [Thu, 17 Nov 2016 23:17:08 +0000 (23:17 +0000)]
Merge "Build: Add agent library to default packages"
Andreas Gampe [Thu, 17 Nov 2016 21:54:49 +0000 (13:54 -0800)]
Build: Refactor and clean up runtime_libart
Split out dependencies and removes some transitives. In preparation
for moving the modules.
Test: m
Test: Device boots
Change-Id: I7cdccd178eef9a625607a74ba8496651591e4cb4
William Roberts [Sat, 9 Apr 2016 05:06:19 +0000 (22:06 -0700)]
fs_config: move sort to be consistent with other sort
Test: Checked diff and hash of before and after output files, same.
Test: Tested build for basic boot and functionality.
Change-Id: If7806427e3a2a9ddb7a2c9aa14e1e4f9bf696acf
Signed-off-by: William Roberts <william.c.roberts@intel.com>
William Roberts [Sat, 9 Apr 2016 17:24:25 +0000 (10:24 -0700)]
fs_config: correct README
Testing on earlier versions of Python indicated an error in the
README. Python's ConfigParser prior to version 3.2 allows for
sections within the same file to override later sections.
Correct the README.
Test: Checked diff and hash of output file from before and after.
Change-Id: Ifd3f78414b4803e4b74decb1fdf6816d4902c4a2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Andreas Gampe [Thu, 27 Oct 2016 20:23:29 +0000 (13:23 -0700)]
Build: Add agent library to default packages
Add libopenjdkjvmti to ART dependencies.
Bug:
31455788
Test: m && ls $OUT/system/lib/libopenjdkjvmti.so
Change-Id: Iccf35f04548d74df87ec05f2cb555c1db9d137c6
Chih-hung Hsieh [Tue, 15 Nov 2016 22:34:03 +0000 (22:34 +0000)]
Merge "Separate parallel_classify_warnings out of parse_input_file."
am:
e4fb495b09
Change-Id: I5353f10ea0d78d8d9cd4539e4095b9c0ff010520
Chih-hung Hsieh [Tue, 15 Nov 2016 22:19:36 +0000 (22:19 +0000)]
Merge "Separate parallel_classify_warnings out of parse_input_file."
Robert Sesek [Tue, 15 Nov 2016 19:30:51 +0000 (19:30 +0000)]
Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES."
am:
07b4a59843
Change-Id: Ie5dc3d3d617203ea467ace4440ef0119cb75ad75
Treehugger Robot [Tue, 15 Nov 2016 19:21:12 +0000 (19:21 +0000)]
Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES."
Dan Willemsen [Sun, 13 Nov 2016 20:00:16 +0000 (20:00 +0000)]
Merge "Use new -ninja flag to aidl-cpp"
am:
7d4c926ed7
Change-Id: I165926e0c23a8a9a7dd8f3e46956b53f53d7fc9f
Dan Willemsen [Sun, 13 Nov 2016 19:53:38 +0000 (19:53 +0000)]
Merge "Use new -ninja flag to aidl-cpp"
Dan Willemsen [Sun, 13 Nov 2016 17:42:19 +0000 (09:42 -0800)]
Use new -ninja flag to aidl-cpp
This make aidl-cpp write out a dep file that ninja parses correctly.
Test: Manually inspect ninja depfile
Change-Id: I4890a91eb29a6388e17b1ffac23a3dc0ffe6c212
Dan Willemsen [Fri, 11 Nov 2016 21:42:29 +0000 (21:42 +0000)]
Merge "Remove transform-d-to-p"
am:
da85fecaf1
Change-Id: Ieb010ebfe46ce9312b833191319d56155cc0b397
Dan Willemsen [Fri, 11 Nov 2016 21:38:53 +0000 (21:38 +0000)]
Merge "Remove transform-d-to-p"
Robert Sesek [Fri, 11 Nov 2016 17:38:13 +0000 (12:38 -0500)]
Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES.
Test: lunch aosp_angler-eng && m checkbuild
Bug:
21643067
Change-Id: I1e0b81055fb74d7238f245e11bf2409c776f2efd
Dan Willemsen [Fri, 11 Nov 2016 02:19:36 +0000 (18:19 -0800)]
Remove transform-d-to-p
Ninja doesn't need the phony make targets, in fact, the parser doesn't
handle them correctly and ends up duplicating the dependencies. This
shrinks a `m native` deps file from 54M -> 35M on AOSP.
Test: Compare out/build-aosp_angler.ninja before/after
Test: wrote a tool to dump the .ninja_deps, added dedup feature, files
identical after dedup.
Change-Id: Iec7a9a0739e8678c1f4db79c68e423a39b9aad4b
Dan Willemsen [Fri, 11 Nov 2016 05:41:02 +0000 (05:41 +0000)]
Merge "Fix vendor/google/build/ninja_config.mk"
am:
a9daf15d87
Change-Id: I15afdf34b43317b3566a3c390b09f57fafbadec9
Dan Willemsen [Fri, 11 Nov 2016 05:35:04 +0000 (05:35 +0000)]
Merge "Fix vendor/google/build/ninja_config.mk"
Dan Willemsen [Fri, 11 Nov 2016 03:41:27 +0000 (19:41 -0800)]
Fix vendor/google/build/ninja_config.mk
This needs to be included between PARSE_TIME_MAKE_GOALS and KATI_GOALS
Test: m -j <target-from-internal>
Change-Id: I7284f05336b921d40f04ff5811a47bd0d17a066f
Dan Willemsen [Thu, 10 Nov 2016 23:04:14 +0000 (23:04 +0000)]
Merge changes I1bc291aa,Ib3ec8aa8
am:
0f185d7c3b
Change-Id: Ib6cf95a7946d91c48299c1ef5092a49c231fcc4e
Dan Willemsen [Thu, 10 Nov 2016 23:04:13 +0000 (23:04 +0000)]
Split (ninja|soong).mk into config and rule portions
am:
04f53ed923
Change-Id: I5766f8a60440669c6cda418a4423d159c9697bcb
Dan Willemsen [Thu, 10 Nov 2016 23:04:07 +0000 (23:04 +0000)]
Move some configuration from main.mk to config.mk
am:
cfabc42af9 -s ours
Change-Id: I66cff53cf96698e22064c4087e0e777137b3ad80
Dan Willemsen [Thu, 10 Nov 2016 22:41:24 +0000 (22:41 +0000)]
Merge changes I1bc291aa,Ib3ec8aa8
* changes:
Split (ninja|soong).mk into config and rule portions
Move some configuration from main.mk to config.mk
Dan Willemsen [Thu, 10 Nov 2016 00:35:34 +0000 (16:35 -0800)]
Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.
Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk
Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.
Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
Chih-Hung Hsieh [Thu, 10 Nov 2016 02:19:05 +0000 (18:19 -0800)]
Separate parallel_classify_warnings out of parse_input_file.
* Allow other callers of this module to:
* pass any input stream to parse_input_file,
* pass any warning_lines to parallel_classify_warnings,
* call dump_csv or dump_html to get output.
* No output change.
* Capture and ignore signal.SIGTERM at the end,
to avoid bad warning/error messages from the exit clean-up process.
Test: run warn.py build.log.
Change-Id: I1414797a536c0ee622e2a34c226578621be1ddab
Dan Willemsen [Thu, 10 Nov 2016 01:22:15 +0000 (17:22 -0800)]
Split (ninja|soong).mk into config and rule portions
So that an external tool can read the configuration using
dump-many-vars, and write out the soong.variables file while only
loading config.mk.
Also remove dumpvar-% from PARSE_TIME_MAKE_GOALS, since it's only used
with CALLED_FROM_SETUP / config.mk. This provides an easy way to test
this change as well.
Test: get_build_var NINJA
Test: get_build_var ANDROID_GOALS
Test: get_build_var NINJA_GOALS
Test: get_build_var KATI_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-NINJA_GOALS" get_build_var NINJA_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-KATI_GOALS" get_build_var KATI_GOALS
Test: MAKECMDGOALS="out/build-a.ninja dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: get_build_var SOONG_MAKEVARS_MK
Test: get_build_var SOONG_VARIABLES
Test: CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make -f build/core/config.mk out/soong/soong.variables showcommands
Test: Compare soong.variables from above, and before/after with `m`
Test: Compare out before/after with `m doesnotexist`
Test: `m dist doesnotexist`
Change-Id: I1bc291aa165297c930fe600067edad6ce4979210
Dan Willemsen [Thu, 10 Nov 2016 00:35:34 +0000 (16:35 -0800)]
Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.
Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk
Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.
Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
Clay Murphy [Wed, 9 Nov 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36"
am:
98f15a70e9
Change-Id: I19f35481e688b205790e4f2d817932422b72b93f
Clay Murphy [Wed, 9 Nov 2016 21:18:37 +0000 (21:18 +0000)]
Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36"
Billy Lamberta [Mon, 24 Oct 2016 21:38:19 +0000 (14:38 -0700)]
Creates a css nowrap class for non-breaking elements
in source.android.com
Test: build2stage 36
Change-Id: I467cc66d5e205b00ed188180140b1ae972e2ebad
Tao Bao [Tue, 8 Nov 2016 23:42:26 +0000 (23:42 +0000)]
Merge "releasetools: Use java_path in sign_target_files_apks.py."
am:
4a71d500c1
Change-Id: I61400574ac3f7d29906ca571f497554631ecd72d
Dan Albert [Tue, 8 Nov 2016 23:10:09 +0000 (15:10 -0800)]
Support `LOCAL_SDK_VERSION := current` for NDK.
Test: Added a module using this and checked the link command line.
Bug: None
Change-Id: I3a55e4638340d8835c09ebc6a1440bece962d36e
Tao Bao [Tue, 8 Nov 2016 23:31:50 +0000 (23:31 +0000)]
Merge "releasetools: Use java_path in sign_target_files_apks.py."
Tao Bao [Tue, 8 Nov 2016 20:08:53 +0000 (12:08 -0800)]
releasetools: Use java_path in sign_target_files_apks.py.
Prior to this CL, it was calling the hard-coded "java" although it was
accepting a "--java_path" option.
Also switch OPTIONS.java_args from string to list. Otherwise it won't
work when providing multiple args.
Bug:
32737832
Test: Specify "--java_path=" and "--java_args" when invoking
sign_target_files_apks.py with "-v". Check the commands being
called.
Change-Id: Id7ef98e778646d532027434de7fba9b7a104dbd0
Tao Bao [Sat, 5 Nov 2016 00:13:55 +0000 (00:13 +0000)]
Merge "releasetools: compare size between compressed and patch while build otapackage"
am:
49758959f2
Change-Id: I17b988878cc7ffdfbe490f404c9cd5ab996a8c5f
Tao Bao [Sat, 5 Nov 2016 00:09:35 +0000 (00:09 +0000)]
Merge "releasetools: compare size between compressed and patch while build otapackage"
Tao Bao [Fri, 4 Nov 2016 21:29:15 +0000 (21:29 +0000)]
Merge "releasetools: Make BBOTA incremental generation repeatable."
am:
b9bd78d110
Change-Id: I6402481bf300b52d36df1570cceeae6ec3ff4f8f
Tao Bao [Fri, 4 Nov 2016 21:26:12 +0000 (21:26 +0000)]
Merge "releasetools: Make BBOTA incremental generation repeatable."
Colin Cross [Fri, 4 Nov 2016 18:17:41 +0000 (18:17 +0000)]
Merge "findleaves.py: prevent recursion into symlink loops"
am:
4d8462417d
Change-Id: I9867ab241c20bf6764b20abd58f4efda3a8ba1ef
Colin Cross [Fri, 4 Nov 2016 18:17:35 +0000 (18:17 +0000)]
findleaves.py: prevent recursion into symlink loops
am:
7829ebfebd
Change-Id: Ib0ff185e2798ca57c6c28157a1182e7b4d1ed820
Colin Cross [Fri, 4 Nov 2016 18:09:36 +0000 (18:09 +0000)]
Merge "findleaves.py: prevent recursion into symlink loops"
Colin Cross [Thu, 3 Nov 2016 20:51:10 +0000 (13:51 -0700)]
findleaves.py: prevent recursion into symlink loops
Keep a set of all visited inodes, and prevent recursing into a symlink
to an already visited inode.
Test: m -j
Test: compare `build/tools/findleaves.py --prune=.repo --prune=.git --mindepth=2 --dir=. Android.mk` before and after
Change-Id: Ied14c40d3066ef9f8e8a2b1535f56f7bbbbd0ab6
Colin Cross [Thu, 3 Nov 2016 07:18:27 +0000 (07:18 +0000)]
Merge "Export variable for device sanitize arch to Soong"
am:
d778640b0f
Change-Id: I2e98bdc476179ad990c2a3294fb6c7f56b21115f
Treehugger Robot [Thu, 3 Nov 2016 07:12:53 +0000 (07:12 +0000)]
Merge "Export variable for device sanitize arch to Soong"
Dan Willemsen [Thu, 3 Nov 2016 02:45:12 +0000 (02:45 +0000)]
Merge "Update combined build.ninja to depend on Soong's build.ninja"
am:
77ecb3347b
Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7
Dan Willemsen [Thu, 3 Nov 2016 02:39:18 +0000 (02:39 +0000)]
Merge "Update combined build.ninja to depend on Soong's build.ninja"
Dan Willemsen [Wed, 2 Nov 2016 23:24:52 +0000 (16:24 -0700)]
Update combined build.ninja to depend on Soong's build.ninja
For Soong's build.ninja regeneration to work
Bug:
32574042
Test: m -j, add globbed file, m -j
Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
Colin Cross [Wed, 2 Nov 2016 22:05:21 +0000 (15:05 -0700)]
Export variable for device sanitize arch to Soong
Also renames the variable from SANITIZE_ARCH to SANITIZE_TARGET_ARCH,
and makes it only apply to the device.
Bug:
29498013
Test: No change to build.ninja files with m -j SANITIZE_TARGET=address
Change-Id: Ib5f6ab448f5d96d2426c983308136670f9a55b7b
Dan Willemsen [Tue, 1 Nov 2016 17:23:59 +0000 (17:23 +0000)]
Merge "Remove configuration exported from Soong"
am:
b1e0c2c478
Change-Id: I4674044e2dce477fa9ad747eebe8daa1b7824c38
Dan Willemsen [Tue, 1 Nov 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Remove configuration exported from Soong"
Dan Willemsen [Tue, 1 Nov 2016 01:22:21 +0000 (01:22 +0000)]
Merge "Pass global tidy configuration to Soong"
am:
ca5748fbe1
Change-Id: I69e7e5bf9960025febafe0bafa746b650718283c
Treehugger Robot [Tue, 1 Nov 2016 01:18:59 +0000 (01:18 +0000)]
Merge "Pass global tidy configuration to Soong"