OSDN Git Service
Treehugger Robot [Fri, 23 Sep 2016 04:33:11 +0000 (04:33 +0000)]
Merge "Recognize new warning messages."
Treehugger Robot [Fri, 23 Sep 2016 04:30:02 +0000 (04:30 +0000)]
Merge "link_type check: Support modules installed into /data"
Chih-Hung Hsieh [Wed, 21 Sep 2016 21:00:23 +0000 (14:00 -0700)]
Recognize new warning messages.
* -Wunnamed-type-template-args and -W#pragma-messages
Test: run warn.py with build.log.
Change-Id: I36277e001081604f92a4d9c92f9a0b5d3f0ee5e5
Treehugger Robot [Fri, 23 Sep 2016 00:16:52 +0000 (00:16 +0000)]
Merge "Pass userdebug/eng variant to Soong"
Treehugger Robot [Fri, 23 Sep 2016 00:06:26 +0000 (00:06 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow."
Dan Willemsen [Thu, 22 Sep 2016 21:52:53 +0000 (14:52 -0700)]
Pass userdebug/eng variant to Soong
Test: Run build with eng/userdebug/user and check the soong.variables
Change-Id: I7cd71a94e92526b6cc61303b13b7bc593cbbfc3a
Chih-Hung Hsieh [Thu, 22 Sep 2016 20:43:12 +0000 (13:43 -0700)]
Simplify warn.py and output of warning count table and tablerow.
* Use a loop to initialize empty 'members' and 'option' of warnpatterns.
* Create severity.{color,columnheader,header} from an attributes list.
* Compute totalbyproject and totalbyseverity from a constructor.
* Skip all-zero rows and columns in the warning count table.
* Remove redundant spaces and newlines in tablerow output.
Test: run through build.log files
Change-Id: I4d3fa4ecd92e1afab91d85b7535d03f8696e83d8
Dan Willemsen [Thu, 22 Sep 2016 17:56:36 +0000 (10:56 -0700)]
link_type check: Support modules installed into /data
Test: compare build.ninja before/after, look at warnings.html
Change-Id: I1b78748dd80b73d2601b2adf0aaac8a6b2b350d5
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
* changes:
Fix bad JACK_PLUGIN variable
Add support for Jack plugin
Dan Willemsen [Wed, 21 Sep 2016 19:39:47 +0000 (19:39 +0000)]
Merge "Package up proguard jack_dictionary"
Yohann Roussel [Mon, 19 Sep 2016 15:49:03 +0000 (17:49 +0200)]
Fix bad JACK_PLUGIN variable
Changed to LOCAL_JACK_PLUGIN.
(cherry picked from commit
17924b136cb5bfc60d138e8c7e5c18a90b5965c3)
Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I1be4aaa502103fc308d35a5672dc4fe5900c4ebe
Yohann Roussel [Fri, 5 Aug 2016 15:45:10 +0000 (17:45 +0200)]
Add support for Jack plugin
And ensure compatibility with coverage plugin.
(cherry picked from commit
862bb84d37e3e6ca61080de58f206e512e09d4e0)
Bug:
28876950
Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I804558a501825357bf0812de626d2957eedbdc13
Treehugger Robot [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
Colin Cross [Tue, 20 Sep 2016 23:01:28 +0000 (16:01 -0700)]
Replace usages of my_register_name with my_all_targets
A few module types add extra dependencies on $(my_register_name), move
them to $(my_all_targets) so that they are built for mm and mma too.
Bug:
31526036
Test: mmm framework
Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595
Dan Willemsen [Thu, 1 Sep 2016 18:02:43 +0000 (11:02 -0700)]
Package up proguard jack_dictionary
Bug:
31182185
Test: m dist in an unbundled branch
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
Paul Duffin [Tue, 20 Sep 2016 11:51:40 +0000 (11:51 +0000)]
Merge "Add targets for building individual modules using javac"
Dan Willemsen [Mon, 19 Sep 2016 21:54:08 +0000 (21:54 +0000)]
Merge "Fix link_type checking"
Treehugger Robot [Mon, 19 Sep 2016 17:28:01 +0000 (17:28 +0000)]
Merge "Add a script that verifies OTA package signature."
Paul Duffin [Thu, 15 Sep 2016 13:34:42 +0000 (14:34 +0100)]
Add targets for building individual modules using javac
This is needed in order to be able to run error prone (which is
a plugin replacement for javac) on a subset of the java code.
Bug:
31507496
Test: Build javac-check-core-tests and check the resulting JAR
Change-Id: I5a556920572fcdad7b39d67e3f00fe0e0f1f8f46
Dan Willemsen [Sat, 17 Sep 2016 02:29:06 +0000 (02:29 +0000)]
Merge "Only update previous product config when changed"
Tao Bao [Tue, 13 Sep 2016 18:13:48 +0000 (11:13 -0700)]
Add a script that verifies OTA package signature.
Currently it supports verifying packages signed with RSA algorithms
(v1-v4 as in bootable/recovery/verifier.cpp). No support for ECDSA (v5)
signed packages yet.
$ ./build/tools/releasetools/check_ota_package_signature.py \
bootable/recovery/tests/testdata/testkey_v1.x509.pem \
bootable/recovery/tests/testdata/otasigned_v1.zip
Package: bootable/recovery/tests/testdata/otasigned_v1.zip
Certificate: bootable/recovery/tests/testdata/testkey_v1.x509.pem
Comment length: 1738
Signed data length: 2269
Use SHA-256: False
Digest:
115e688ec3b77743070b743453e2fc6ce8754484
VERIFIED
Bug:
31523193
Test: Used the tool to verify existing packages (like above).
Change-Id: I71d3569e858c729cb64825c5c7688ededc397aa8
Treehugger Robot [Fri, 16 Sep 2016 21:46:20 +0000 (21:46 +0000)]
Merge "Remove objclean"
Dan Willemsen [Fri, 16 Sep 2016 17:03:22 +0000 (10:03 -0700)]
Only update previous product config when changed
I'm working on removing the --ignore_dirty=$(OUT_DIR)/% argument from
Kati. If we're always writing to a file that we're also reading, then
with that flag removed, we'll always reparse all the makefiles.
So instead, use the method from the generated java file cleanup where we
read from a "previous" file, write to a "current" file, then use a
cmp || mv to overwrite the "previous" file if necessary. When the flag
is removed, this will cause Kati to need to run twice any time this
changes, but it's better than forever.
Bug:
30947985
Test: Switch between aosp_arm-eng and full-eng
Change-Id: Id2d1445809b60ce26700bb2aca765df3b5c2b360
Dan Willemsen [Fri, 16 Sep 2016 05:03:04 +0000 (22:03 -0700)]
Remove objclean
We don't need to manually remove objects when switching SANITIZE_TARGET
-- that will be handled by Ninja noticing that the command lines are
different.
Bug:
30947985
Test: None
Change-Id: I83c15981cf6ea258bb7fa85490b0b1ede1058aa6
Treehugger Robot [Fri, 16 Sep 2016 06:40:32 +0000 (06:40 +0000)]
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
* changes:
Use libcompiler-rt_extras with NDK builds.
Always link libdl with libc++ for the NDK.
Treehugger Robot [Fri, 16 Sep 2016 02:06:18 +0000 (02:06 +0000)]
Merge "Fix typo in coverage target out path."
Ryan Campbell [Fri, 16 Sep 2016 00:32:13 +0000 (17:32 -0700)]
Fix typo in coverage target out path.
Change-Id: I4a448708ab74e08b2c515039ee5d71c32861214e
Dan Willemsen [Thu, 15 Sep 2016 04:38:29 +0000 (21:38 -0700)]
Fix link_type checking
This was printing "error:", but not actually triggering an error.
Instead of trying to write a single line bash script to handle this,
move the actual check into python. This allows us to print all of the
errors for a single module before triggering the failure.
Also updates the warning format and the warn.py script to properly parse
these warning. Many of the java:sdk -> java:platform warnings are false
positives due to the lack of LOCAL_SDK_VERSION markings on prebuilts.
Individual tags can be marked as warnings now, which lets us check for
system libraries linking against vendor libraries (which won't work on
AOSP). I'm not sure this is a completely valid check, which one reason
that it's just a warning.
Test: m all_link_types (with some missing libs commented out)
Change-Id: I333e418c9a4511b7c7e826891ae481da08fbf6f9
Treehugger Robot [Thu, 15 Sep 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS"
Colin Cross [Thu, 15 Sep 2016 16:29:15 +0000 (09:29 -0700)]
Remove SRC_SYSTEM_HEADERS
It is inherited from Soong now.
Bug:
31492149
Change-Id: Ia9bfd9662dba16032dac68b55b4f0743c0688139
Treehugger Robot [Thu, 15 Sep 2016 03:41:24 +0000 (03:41 +0000)]
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
Dan Albert [Wed, 14 Sep 2016 23:08:48 +0000 (16:08 -0700)]
Use libcompiler-rt_extras with NDK builds.
We want to build things in CTS (things built against the NDK) with
integer overflow checks. Some projects in the tree also make explicit
calls to the overflow checked builtins, and those projects need to be
built with the NDK (external/dng_sdk is the specific example that
brought this up).
Test: make checkbuild tests
Bug: None
Change-Id: Iab27dd0d931f723140de242049fa72f3b1ce0fb8
Dan Albert [Wed, 14 Sep 2016 23:08:04 +0000 (16:08 -0700)]
Always link libdl with libc++ for the NDK.
libc++ requires libdl whether it's statically linked or not.
Test: make checkbuild tests
Bug: None
Change-Id: I8abdcfaef779b358196716ab1193cebe278317ac
Chih-hung Hsieh [Wed, 14 Sep 2016 16:39:26 +0000 (16:39 +0000)]
Merge "Emit a table of warnings by project and severity."
Dan Willemsen [Tue, 13 Sep 2016 22:39:20 +0000 (22:39 +0000)]
Merge "Fix shared library install dependencies outside of /system"
Dan Willemsen [Tue, 13 Sep 2016 20:28:51 +0000 (13:28 -0700)]
Fix shared library install dependencies outside of /system
For properly picking the shared library install dependencies, HOST_OUT
and HOST_CROSS_OUT are necessary so that we don't add a dependency
between Linux and Windows. But for target modules, we must use
TARGET_OUT_ROOT instead of TARGET_OUT, or modules in /data and /vendor
won't have proper install dependencies.
Bug:
31462199
Test: m bionic-unit-tests; manual diff of generated ninja file
Change-Id: I828fa2664613296cc6c431813f5657abffdd2b8f
Ryan Campbell [Tue, 13 Sep 2016 19:48:34 +0000 (19:48 +0000)]
Merge "Implement path-based enabling of code coverage."
Treehugger Robot [Tue, 13 Sep 2016 19:19:46 +0000 (19:19 +0000)]
Merge "Fix building static linux binaries"
Dan Willemsen [Tue, 13 Sep 2016 17:44:44 +0000 (10:44 -0700)]
Fix building static linux binaries
BUILD_HOST_static has been broken because I was stripping
-Wl,--start-group/-Wl,--end-group into a separate set of ldflags instead
of keeping them wrapped around some of the ldlibs. So don't pass some of
the build system flags through the ldlibs checker.
Bug:
30898128
Change-Id: I332b42679695cdc5da3cb0036290b6a3544699c0
Ryan Campbell [Mon, 12 Sep 2016 20:56:50 +0000 (13:56 -0700)]
Implement path-based enabling of code coverage.
Native coverage is enabled by setting NATIVE_COVERAGE to true
and specifying a list of paths in the COVERAGE_PATHS
environment variable. Files are exported to a zip file in the
target out directory.
Change-Id: I66a2ddd88e849bec1cc0cdae1b51fe18a007e2c3
Chih-Hung Hsieh [Mon, 12 Sep 2016 23:20:49 +0000 (16:20 -0700)]
Emit a table of warnings by project and severity.
* Use 't1' CSS class for main warning tables,
and default table style for new warning count table.
* Count total skipped warnings.
* Append count of warnings in each severity header.
* Fix some skipped warning patterns and count/dump skipped warnings.
* Add dumpskippedanchors function to fix expand_collapse
error when --byproject flag is used and severity.SKIP
is not emitted.
* Minor coding style changes:
* Loop through severity.kinds.
* Remove unused import.
* Add spaces around assignment operators.
* Adjust indentation.
Bug:
31377083
Test: run warn.py with build.log
Change-Id: I68949edc4601b10ea2f7ac84e48e6c3da4ab1e4f
Treehugger Robot [Tue, 13 Sep 2016 04:29:36 +0000 (04:29 +0000)]
Merge "Remove incremental workaround for aapt overlays"
Yoshisato Yanagisawa [Tue, 13 Sep 2016 03:53:08 +0000 (12:53 +0900)]
goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set.
During the development of goma client, we sometimes need to use goma
compiler_proxy, which has already been running.
Test: NOSTART_GOMA=1 USE_GOMA=1 m.
Change-Id: Ifa969c40871325fd43ee6443ddbe3b18fde62c5a
Dan Willemsen [Tue, 13 Sep 2016 03:26:33 +0000 (20:26 -0700)]
Remove incremental workaround for aapt overlays
This workaround to clean package intermediates is no longer necessary,
as ninja reruns commands whose command line changes.
Test: switch between product overlays that use add-resource, verify
R.java is regenerated.
Change-Id: Icb1f76360e39882e4401180414a031956777b020
Treehugger Robot [Tue, 13 Sep 2016 00:07:28 +0000 (00:07 +0000)]
Merge "Remove speex from the pathmap"
Dan Willemsen [Mon, 12 Sep 2016 23:10:20 +0000 (16:10 -0700)]
Remove speex from the pathmap
libspeexresampler uses LOCAL_EXPORT_C_INCLUDE_DIRS to export this path
to all of its users already.
Test: m libaudiopreprocessing libaudioutils
Change-Id: I682303142840d6f0f02c990de8e713620840bbda
Treehugger Robot [Mon, 12 Sep 2016 20:48:42 +0000 (20:48 +0000)]
Merge "Update NDK gtest lib names."
Treehugger Robot [Mon, 12 Sep 2016 19:06:54 +0000 (19:06 +0000)]
Merge "Fix libgcov.a dependency"
Dan Willemsen [Tue, 23 Aug 2016 06:53:47 +0000 (06:53 +0000)]
Fix libgcov.a dependency
Now that Soong is generating libgcov.a, we need a dependency here.
Change-Id: Ie8d97339fd584eed178cc57b9333d38754ab1135
David Brazdil [Mon, 12 Sep 2016 14:57:19 +0000 (14:57 +0000)]
Merge "Update build rules for VDEX"
Colin Cross [Fri, 9 Sep 2016 20:27:21 +0000 (20:27 +0000)]
Merge "Remove global linker search paths"
Colin Cross [Fri, 9 Sep 2016 17:09:47 +0000 (10:09 -0700)]
Remove global linker search paths
Remove the global linker search path, as it can cause spurious build
failures. If a library with the same name as a system library is in the
process of being written to the directory in the global search path, and
the linker may try to read the partially-written built one instead of the
system one. We already use full paths to libraries for target builds,
do the same for host builds. Also remove the normalize library
functions, they are no longer necessary.
Test: m -j checkbuild
Bug:
31393456
Change-Id: If9fc631e111f568c700fd73e103445c30d7e9d11
David Brazdil [Thu, 25 Aug 2016 12:50:15 +0000 (13:50 +0100)]
Update build rules for VDEX
ART now produces a new output file called VDEX, produced alongside the
existing OAT file. This patch updates the relevant build rules.
Bug:
30937355
Change-Id: Ib6be9f8f36c8f061dbbebd72cb55a5d4b6dc27eb
Dan Albert [Tue, 26 Apr 2016 21:18:01 +0000 (14:18 -0700)]
Update NDK gtest lib names.
The NDK gtest libs are always suffixed to simplify the make macro
that generates the test modules.
Bug: http://b/
16574165
Change-Id: I1c9647e90aff2f1e9da4a88cad30199b1e423757
Treehugger Robot [Fri, 9 Sep 2016 01:25:21 +0000 (01:25 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS"
Dan Willemsen [Fri, 9 Sep 2016 00:08:31 +0000 (17:08 -0700)]
Prevent Kati from seeing MAKEFLAGS
We never want Kati to see MAKEFLAGS, as forcefully overriding variables
is terrible. The variables in MAKEFLAGS are still available in the
environment, so if part of the build wants input from the user, it
should be explicitly checking for an environment variable or using ?=
This commit shouldn't actually change any behavior -- the version of
Kati checked into our tree doesn't actually read MAKEFLAGS (the latest
version does, which is why this change is necessary). We're also already
clearing MAKEFLAGS during makeparallel, so the USE_GOMA case already
doesn't pass through MAKEFLAGS.
Test: Manual $(warnings $(origin MYTEST) $(MYTEST)) with old and new Kati
Change-Id: I5e4ffa66b3539a539cc7a26da24645b11445c469
Dan Willemsen [Thu, 8 Sep 2016 20:47:19 +0000 (20:47 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable"
Chih-hung Hsieh [Thu, 8 Sep 2016 20:24:07 +0000 (20:24 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
Dan Willemsen [Thu, 8 Sep 2016 19:45:15 +0000 (12:45 -0700)]
Blacklist the GOMACC_PATH environment variable
The clang compiler wrapper will be looking for this environment
variable, but it should only ever be set by the `gomacc` in CC_WRAPPER.
Make sure that it isn't otherwise set in the environment.
Change-Id: I4b26c7183bc47f71dffa7dfcc2e5b08e840a11b1
Treehugger Robot [Thu, 8 Sep 2016 17:10:37 +0000 (17:10 +0000)]
Merge ""SignApk" in Created-By header"
Treehugger Robot [Wed, 7 Sep 2016 22:00:24 +0000 (22:00 +0000)]
Merge "Build symlinks for -host and -target phony modules"
Colin Cross [Wed, 7 Sep 2016 19:48:30 +0000 (12:48 -0700)]
Build symlinks for -host and -target phony modules
Move extra module dependencies like symlinks from dependencies of
$(my_register_name) to $(my_all_targets), and make $(my_register_name)
and other convenience phony modules depend on $(my_all_targets). Move
$(LOCAL_MODULE)-host/-target to depend on $(my_all_targets) instead of
directly depending on the built and installed modules.
Change-Id: I3b093986db7a1bff118f1f2482275f0997a98fb6
Alex Klyubin [Wed, 7 Sep 2016 20:21:00 +0000 (13:21 -0700)]
"SignApk" in Created-By header
The switch to apksig changed the Created-By header value in .SF file
from "1.0 (Android SignApk)" to "1.0 (Android apksigner)". This commit
reverts the value back to "1.0 (Android SignApk)".
Change-Id: I2fc462cade40a5b31bb6191996fd6f18fabbf08f
Treehugger Robot [Wed, 7 Sep 2016 19:51:06 +0000 (19:51 +0000)]
Merge "Add tool to copy files in to fat16 images"
Chih-hung Hsieh [Wed, 7 Sep 2016 05:27:45 +0000 (05:27 +0000)]
Merge "Recognize new clang-tidy and Java warnings."
Chih-Hung Hsieh [Tue, 6 Sep 2016 23:26:46 +0000 (16:26 -0700)]
Recognize new clang-tidy and Java warnings.
Test: run warn.py with build.log
Change-Id: I11ff844bcfd7fb13aef8909307bc7eb1f5ee9b2a
Chih-Hung Hsieh [Wed, 7 Sep 2016 03:06:28 +0000 (20:06 -0700)]
Define DEFAULT_TIDY_HEADER_DIRS.
Let clang-tidy report warnings in header files in the
system and current directories but not the external
and vendor directories.
Test: build with WITH_TIDY=1
Change-Id: I1723b8eb95948961fb7164a19989e0a926e5bf8a
Treehugger Robot [Tue, 6 Sep 2016 22:38:39 +0000 (22:38 +0000)]
Merge changes I65c3fa9a,Id1ea5e8b
* changes:
Pair mips64r6 with mips32r2 on Aosp
Allowing pairing mips64r6 with mips32r1 and r2
Treehugger Robot [Tue, 6 Sep 2016 21:40:19 +0000 (21:40 +0000)]
Merge "Use full path in symbols zip file"
Dan Willemsen [Tue, 6 Sep 2016 20:47:05 +0000 (13:47 -0700)]
Use full path in symbols zip file
This was accidentally changed when moving to soong_zip.
Change-Id: I5f889c3c83b6f888e765d4c35486576fa11f6945
Colin Cross [Sat, 3 Sep 2016 00:29:41 +0000 (00:29 +0000)]
Merge "Remove HOST_PREFER_32_BIT"
Vishwath Mohan [Fri, 2 Sep 2016 21:27:41 +0000 (21:27 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
Casey Dahlin [Fri, 2 Sep 2016 01:07:15 +0000 (18:07 -0700)]
Add tool to copy files in to fat16 images
fat16copy.py can be used to copy files or directories in to the root of
a fat16 image.
Usage: fat16copy <image> <file> [<file> ...]
Test: Used to compose a Raspberry Pi 3 boot image
Bug:
28912590
Change-Id: I29c9eec3786e2c5cc94f9a160360bac850809a93
Vishwath Mohan [Fri, 2 Sep 2016 20:25:59 +0000 (13:25 -0700)]
Create sub-directory for fuzzers under nativetest.
This CL changes BUILD_FUZZ_TEST to generate binaries in a
sub-directory called fuzzers/ under the nativetest directory. This
allows fuzzers to be distinguished from the other native tests and
makes it easier to perform automated fuzz-testing.
Bug:
25714111
Change-Id: I452e43f15728ec9168dd44776b6ffcea6037fa7f
Colin Cross [Fri, 2 Sep 2016 20:20:52 +0000 (13:20 -0700)]
Remove HOST_PREFER_32_BIT
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.
Change-Id: I874f89c7d1e9cd8c9d4c879048d81a4362ce4dce
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "build_image: add padding to match partition size"
Sami Tolvanen [Thu, 1 Sep 2016 22:58:35 +0000 (15:58 -0700)]
build_image: add padding to match partition size
For some partition sizes, we currently build an image that's 1-2
blocks smaller than the actual partition, which causes fs_mgr to
not find metadata. This change adds padding to FEC metadata that
correctly positions the metadata header at the end.
Bug:
28865197
Change-Id: Ie0e044715a9c5ae8ba395e7d2ff9fbd7cffc0b4c
Treehugger Robot [Thu, 1 Sep 2016 23:34:52 +0000 (23:34 +0000)]
Merge "Walk up tree to find makefiles in mma"
Colin Cross [Thu, 1 Sep 2016 22:30:18 +0000 (15:30 -0700)]
Walk up tree to find makefiles in mma
Call findmakefile in mma to walk up the tree to find the nearest
makefile. Fixes mma in subdirectories of directories that have
Android.mk or Android.bp files.
Change-Id: I6fa509171699071fc34a2a75dd7e191d4ddca31a
Treehugger Robot [Thu, 1 Sep 2016 17:04:49 +0000 (17:04 +0000)]
Merge "Canonicalize mmm path"
Colin Cross [Thu, 1 Sep 2016 15:59:38 +0000 (15:59 +0000)]
Merge "Don't double-wrap with gomacc"
Colin Cross [Thu, 1 Sep 2016 00:22:36 +0000 (17:22 -0700)]
Canonicalize mmm path
Canonicalize the mmm path relative to the top level before creating the
MODULES-IN-dir target. Fixes cd frameworks/base; mmm -j .
Test: cd frameworks/base; mmm -j
Change-Id: If7bc321e8a87b76121f876bf4bc296b0f9b80578
Colin Cross [Wed, 31 Aug 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Create more shortcut phony targets"
Colin Cross [Wed, 31 Aug 2016 20:32:39 +0000 (13:32 -0700)]
Don't double-wrap with gomacc
config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER. Only export it from make so gomacc doesn't appear twice on
the command line.
Bug:
31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
Colin Cross [Wed, 31 Aug 2016 20:08:57 +0000 (20:08 +0000)]
Merge "Enable goma in soong"
Colin Cross [Wed, 31 Aug 2016 16:35:32 +0000 (09:35 -0700)]
Enable goma in soong
Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.
Bug:
31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
Dan Willemsen [Wed, 31 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "Simplify Soong bootstrapping"
Dan Willemsen [Mon, 15 Aug 2016 20:38:21 +0000 (13:38 -0700)]
Simplify Soong bootstrapping
Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.
Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
Colin Cross [Tue, 30 Aug 2016 23:16:32 +0000 (16:16 -0700)]
Create more shortcut phony targets
Create shortcut phony targets for the host and device halves of
modules.
Change-Id: I1cf3a49118db830d78a1b83b2177715175949871
Treehugger Robot [Mon, 29 Aug 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Check USE_GOMA consistently"
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:38:34 +0000 (19:38 +0000)]
Merge "Switch to prebuilt clang-
3217047"
Dan Willemsen [Sun, 28 Aug 2016 01:29:08 +0000 (18:29 -0700)]
Check USE_GOMA consistently
Currently, the only way to properly disable goma is to unset USE_GOMA.
If you set USE_GOMA=false, we won't turn on goma, but we'll pass -j500
to ninja.
Test: USE_GOMA={x,false} m -j48 showcommands (inspect)
Change-Id: I6b327d08ebadbe614a3bf7646fd597054bbfaaa2
Treehugger Robot [Fri, 26 Aug 2016 22:37:19 +0000 (22:37 +0000)]
Merge "Identify modules ready to be converted to Soong"
Pirama Arumuga Nainar [Wed, 24 Aug 2016 16:43:44 +0000 (09:43 -0700)]
Switch to prebuilt clang-
3217047
Bug: http://b/
30421084
Change-Id: I41acd016992a0c5043b6ea018f205fad44c88b9e
Test: Tested build, boot and common usage for several devices in AOSP
and internal branch.
Dan Willemsen [Fri, 26 Aug 2016 20:27:13 +0000 (13:27 -0700)]
Identify modules ready to be converted to Soong
The output will be in the `m dist` results as soong_to_convert.txt, or
can be built using:
$ m $OUT/soong_to_convert.txt
The output is a list of modules that are probably ready to convert to
Soong:
# Blocked on Module (potential problems)
283 libEGL (srcs_dotarm)
246 libicuuc (dotdot_incs dotdot_srcs)
221 libspeexresampler
215 libcamera_metadata
...
0 zram-perf (dotdot_incs)
The number at the beginning of the line shows how many native modules
depend on that module.
All of their dependencies have been satisfied, and any potential
problems that Make can detect are listed in parenthesis after the
module:
dotdot_srcs: LOCAL_SRC_FILES contains paths outside $(LOCAL_PATH)
dotdot_incs: LOCAL_C_INCLUDES contains paths include '..'
srcs_dotarm: LOCAL_SRC_FILES contains source files like <...>.c.arm
aidl: LOCAL_SRC_FILES contains .aidl sources
dbus: LOCAL_SRC_FILES contains .dbus-xml sources
objc: LOCAL_SRC_FILES contains Objective-C sources
proto: LOCAL_SRC_FILES contains .proto sources
rs: LOCAL_SRC_FILES contains renderscript sources
vts: LOCAL_SRC_FILES contains .vts sources
Not all problems can be discovered, but this is a starting point.
Change-Id: I45674fe93fd267d4d1fb0bc3bc9aa025e20c5ac6
Treehugger Robot [Fri, 26 Aug 2016 00:02:34 +0000 (00:02 +0000)]
Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong"
Colin Cross [Wed, 24 Aug 2016 22:29:38 +0000 (15:29 -0700)]
Export TARGET_PREFER_32_BIT_EXECUTABLES to soong
Change-Id: I1427d88c7539c5ed0c4c238bad4a28f73d29ef0f
Colin Cross [Thu, 25 Aug 2016 20:39:31 +0000 (20:39 +0000)]
Merge "Install symlinks when using shortcut phony targets"
Chih-hung Hsieh [Thu, 25 Aug 2016 02:24:32 +0000 (02:24 +0000)]
Merge "Suppress clang-tidy checks in frameworks/compile/mclinker."
Colin Cross [Wed, 24 Aug 2016 22:20:23 +0000 (15:20 -0700)]
Install symlinks when using shortcut phony targets
Make symlinks an order-only dependency of the module name phony target
so that they get installed with make module or make MODULES-IN-path.
Test: mmma -j art/dalvikvm, remove symlink in $OUT and retry
Change-Id: Iae472a1c8fa1e8386cc9556cfe819bd4fca99428