OSDN Git Service

android-x86/build.git
7 years agoMerge "Fix Google pylint warnings."
Chih-Hung Hsieh [Mon, 26 Sep 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Fix Google pylint warnings."
am: bcd229277a

Change-Id: Ia7948dfee4dbb48957c4e0ab4b5517e4d9cff71e

7 years agoMerge "Fix Google pylint warnings."
Treehugger Robot [Mon, 26 Sep 2016 21:18:07 +0000 (21:18 +0000)]
Merge "Fix Google pylint warnings."

7 years agoFix Google pylint warnings.
Chih-Hung Hsieh [Mon, 26 Sep 2016 17:56:43 +0000 (10:56 -0700)]
Fix Google pylint warnings.

* Rename variables and functions to follow Google coding style.
* Fix line indentations to follow Google coding style.
* Add module and function docstrings.
* Change shebang line to avoid pylint warning.
* Suppress some pylint warnings to avoid too many changes at once.
* Fix typos.

Test: run warn.py --byproject build.log
Change-Id: I569961981b562e35cb5609a96cd5ebb40a80829c

7 years agoMerge "Recognize new warning messages."
Chih-Hung Hsieh [Fri, 23 Sep 2016 04:37:12 +0000 (04:37 +0000)]
Merge "Recognize new warning messages."
am: b0553ca65b

Change-Id: Ic2f262f62121e19e1daba9a0a3c95fd6ebcc2b1a

7 years agoMerge "link_type check: Support modules installed into /data"
Dan Willemsen [Fri, 23 Sep 2016 04:35:14 +0000 (04:35 +0000)]
Merge "link_type check: Support modules installed into /data"
am: 8870658397

Change-Id: I73b1dcc5296c2ed3b3dec9d5be0adb3645fd5ded

7 years agolink_type check: Support modules installed into /data
Dan Willemsen [Fri, 23 Sep 2016 04:35:13 +0000 (04:35 +0000)]
link_type check: Support modules installed into /data
am: 3594cee467

Change-Id: I3735c05d317aa5c125471c7e91124cd45ebe4a98

7 years agoMerge "Recognize new warning messages."
Treehugger Robot [Fri, 23 Sep 2016 04:33:11 +0000 (04:33 +0000)]
Merge "Recognize new warning messages."

7 years agoMerge "link_type check: Support modules installed into /data"
Treehugger Robot [Fri, 23 Sep 2016 04:30:02 +0000 (04:30 +0000)]
Merge "link_type check: Support modules installed into /data"

7 years agoRecognize new warning messages.
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

7 years agoMerge "Pass userdebug/eng variant to Soong"
Dan Willemsen [Fri, 23 Sep 2016 00:21:40 +0000 (00:21 +0000)]
Merge "Pass userdebug/eng variant to Soong"
am: 19f24492db

Change-Id: Ic13d60a9bf2c036f3d1babcecda6c5b50c5e9a69

7 years agoMerge "Pass userdebug/eng variant to Soong"
Treehugger Robot [Fri, 23 Sep 2016 00:16:52 +0000 (00:16 +0000)]
Merge "Pass userdebug/eng variant to Soong"

7 years agoMerge "Simplify warn.py and output of warning count table and tablerow."
Chih-Hung Hsieh [Fri, 23 Sep 2016 00:11:13 +0000 (00:11 +0000)]
Merge "Simplify warn.py and output of warning count table and tablerow."
am: eac773047f

Change-Id: I25da893dc7add3c92fda9fe003a2cd23f9971e36

7 years agoMerge "Simplify warn.py and output of warning count table and tablerow."
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."

7 years agoPass userdebug/eng variant to Soong
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

7 years agoSimplify warn.py and output of warning count table and tablerow.
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

7 years agolink_type check: Support modules installed into /data
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

7 years agoMerge changes from topic 'jack-d-b3-as-stable'
Benoit Lamarche [Thu, 22 Sep 2016 09:43:29 +0000 (09:43 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
am: 52eafee87a

Change-Id: I7e4fb947fe8f2c5ea8d1091583c468f8c9ca3d35

7 years agoFix bad JACK_PLUGIN variable
Yohann Roussel [Thu, 22 Sep 2016 09:41:30 +0000 (09:41 +0000)]
Fix bad JACK_PLUGIN variable
am: 16243bdbec

Change-Id: Ic0c8dfc081ce1bc0a267474bf1ce7d3ca3dfbb03

7 years agoAdd support for Jack plugin
Yohann Roussel [Thu, 22 Sep 2016 09:41:22 +0000 (09:41 +0000)]
Add support for Jack plugin
am: 53b7fbbe78

Change-Id: Idec54986c0afe10973c464c6edb533321441eea7

7 years agoMerge changes from topic 'jack-d-b3-as-stable'
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

7 years agoMerge "Package up proguard jack_dictionary"
Dan Willemsen [Wed, 21 Sep 2016 19:48:20 +0000 (19:48 +0000)]
Merge "Package up proguard jack_dictionary"
am: f7d1a6d75f

Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6

7 years agoMerge "Package up proguard jack_dictionary"
Dan Willemsen [Wed, 21 Sep 2016 19:39:47 +0000 (19:39 +0000)]
Merge "Package up proguard jack_dictionary"

7 years agoFix bad JACK_PLUGIN variable
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

7 years agoAdd support for Jack plugin
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

7 years agoMerge "Replace usages of my_register_name with my_all_targets"
Colin Cross [Wed, 21 Sep 2016 02:05:53 +0000 (02:05 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
am: 077d9d5fe7

Change-Id: I7e833dab3ff53e8524a227038c8de92e8e67393c

7 years agoMerge "Replace usages of my_register_name with my_all_targets"
Treehugger Robot [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"

7 years agoReplace 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

7 years agoPackage up proguard jack_dictionary
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

7 years agoMerge "Add targets for building individual modules using javac"
Paul Duffin [Tue, 20 Sep 2016 11:56:48 +0000 (11:56 +0000)]
Merge "Add targets for building individual modules using javac"
am: cb6f7c2d86

Change-Id: Ic529ef16ed95c88bd32c68b050d2b784a6d6cf71

7 years agoMerge "Add targets for building individual modules using javac"
Paul Duffin [Tue, 20 Sep 2016 11:51:40 +0000 (11:51 +0000)]
Merge "Add targets for building individual modules using javac"

7 years agoMerge "Fix link_type checking"
Dan Willemsen [Mon, 19 Sep 2016 22:40:37 +0000 (22:40 +0000)]
Merge "Fix link_type checking"
am: 665cda08f0

Change-Id: I95ca55160ae6a8b3a5d05a2a2cbc653dc3855981

7 years agoMerge "Fix link_type checking"
Dan Willemsen [Mon, 19 Sep 2016 21:54:08 +0000 (21:54 +0000)]
Merge "Fix link_type checking"

7 years agoMerge "Add a script that verifies OTA package signature."
Tao Bao [Mon, 19 Sep 2016 17:36:35 +0000 (17:36 +0000)]
Merge "Add a script that verifies OTA package signature."
am: 3b0cb6e842

Change-Id: Ic0441a0652caf75660d599a5b773080c47f01f79

7 years agoMerge "Add a script that verifies OTA package signature."
Treehugger Robot [Mon, 19 Sep 2016 17:28:01 +0000 (17:28 +0000)]
Merge "Add a script that verifies OTA package signature."

7 years agoAdd targets for building individual modules using javac
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

7 years agoMerge "Only update previous product config when changed"
Dan Willemsen [Sat, 17 Sep 2016 02:36:20 +0000 (02:36 +0000)]
Merge "Only update previous product config when changed"
am: 2fcacb5a22

Change-Id: I40024f4a6539130aa9395d6a923a57cd5fe49960

7 years agoMerge "Only update previous product config when changed"
Dan Willemsen [Sat, 17 Sep 2016 02:29:06 +0000 (02:29 +0000)]
Merge "Only update previous product config when changed"

7 years agoAdd a script that verifies OTA package signature.
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

7 years agoMerge "Remove objclean"
Dan Willemsen [Fri, 16 Sep 2016 21:58:57 +0000 (21:58 +0000)]
Merge "Remove objclean"
am: 1d4b79dde2

Change-Id: I89d814220509513c5948a811bfcc75241de6b3cc

7 years agoMerge "Remove objclean"
Treehugger Robot [Fri, 16 Sep 2016 21:46:20 +0000 (21:46 +0000)]
Merge "Remove objclean"

7 years agoOnly update previous product config when changed
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

7 years agoRemove objclean
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

7 years agoMerge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
Dan Albert [Fri, 16 Sep 2016 06:45:34 +0000 (06:45 +0000)]
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
am: 7b351cadfc

Change-Id: Ibce0de2cd113ccb1f97d9f83865be89961c22c54

7 years agoUse libcompiler-rt_extras with NDK builds.
Dan Albert [Fri, 16 Sep 2016 06:45:32 +0000 (06:45 +0000)]
Use libcompiler-rt_extras with NDK builds.
am: c28e4bcb1c

Change-Id: I21541bee4a55951601b6cd110ec78ae94a5da94c

7 years agoAlways link libdl with libc++ for the NDK.
Dan Albert [Fri, 16 Sep 2016 06:45:23 +0000 (06:45 +0000)]
Always link libdl with libc++ for the NDK.
am: 2936a1e84b

Change-Id: I41b0ce041345477931b0b0f59212fcda31899259

7 years agoMerge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
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.

7 years agoMerge "Fix typo in coverage target out path."
Ryan Campbell [Fri, 16 Sep 2016 02:13:32 +0000 (02:13 +0000)]
Merge "Fix typo in coverage target out path."
am: c6507670f2

Change-Id: I09460fa54a7f63fefda7b648d615cf61ce86f778

7 years agoMerge "Fix typo in coverage target out path."
Treehugger Robot [Fri, 16 Sep 2016 02:06:18 +0000 (02:06 +0000)]
Merge "Fix typo in coverage target out path."

7 years agoFix 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

7 years agoFix link_type checking
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

7 years agoMerge "Remove SRC_SYSTEM_HEADERS"
Colin Cross [Thu, 15 Sep 2016 18:38:57 +0000 (18:38 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS"
am: 4a6862e59b

Change-Id: I7864a2f482240f9e310d913d3dec07f99ad20c67

7 years agoMerge "Remove SRC_SYSTEM_HEADERS"
Treehugger Robot [Thu, 15 Sep 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS"

7 years agoRemove 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

7 years agoMerge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
Yoshisato Yanagisawa [Thu, 15 Sep 2016 03:50:44 +0000 (03:50 +0000)]
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
am: 766c348748

Change-Id: I14edc0203aeadfc85a46bc68fa849c4f3d231b87

7 years agoMerge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
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."

7 years agoUse libcompiler-rt_extras with NDK builds.
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

7 years agoAlways link libdl with libc++ for the NDK.
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

7 years agoMerge "Emit a table of warnings by project and severity."
Chih-hung Hsieh [Wed, 14 Sep 2016 16:48:44 +0000 (16:48 +0000)]
Merge "Emit a table of warnings by project and severity."
am: 029ced528b

Change-Id: Ia4c1887c7e82623b9728f409e457d716d561716b

7 years agoMerge "Emit a table of warnings by project and severity."
Chih-hung Hsieh [Wed, 14 Sep 2016 16:39:26 +0000 (16:39 +0000)]
Merge "Emit a table of warnings by project and severity."

7 years agoMerge "Fix shared library install dependencies outside of /system"
Dan Willemsen [Tue, 13 Sep 2016 22:45:35 +0000 (22:45 +0000)]
Merge "Fix shared library install dependencies outside of /system"
am: 0b3f97b0d6

Change-Id: Ia2ffd13b26825c495559565f3c4542815956f660

7 years agoMerge "Fix shared library install dependencies outside of /system"
Dan Willemsen [Tue, 13 Sep 2016 22:39:20 +0000 (22:39 +0000)]
Merge "Fix shared library install dependencies outside of /system"

7 years agoFix 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

7 years agoMerge "Implement path-based enabling of code coverage."
Ryan Campbell [Tue, 13 Sep 2016 19:55:52 +0000 (19:55 +0000)]
Merge "Implement path-based enabling of code coverage."
am: 1e1ecd5d07

Change-Id: I5f60032cfdb365a6f93bb9ca3617cbd08f6b4b21

7 years agoMerge "Implement path-based enabling of code coverage."
Ryan Campbell [Tue, 13 Sep 2016 19:48:34 +0000 (19:48 +0000)]
Merge "Implement path-based enabling of code coverage."

7 years agoMerge "Fix building static linux binaries"
Dan Willemsen [Tue, 13 Sep 2016 19:28:50 +0000 (19:28 +0000)]
Merge "Fix building static linux binaries"
am: 8bb71cef9f

Change-Id: Ied0e1f1d6ed4432536baeae74858f3f524a2ac65

7 years agoMerge "Fix building static linux binaries"
Treehugger Robot [Tue, 13 Sep 2016 19:19:46 +0000 (19:19 +0000)]
Merge "Fix building static linux binaries"

7 years agoFix 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

7 years agoImplement path-based enabling of code coverage.
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

7 years agoEmit a table of warnings by project and severity.
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

7 years agoMerge "Remove incremental workaround for aapt overlays"
Dan Willemsen [Tue, 13 Sep 2016 04:35:52 +0000 (04:35 +0000)]
Merge "Remove incremental workaround for aapt overlays"
am: 946e58bdff

Change-Id: I44a7d1be8ea317e3ce861b2ce0418b112f80a323

7 years agoMerge "Remove incremental workaround for aapt overlays"
Treehugger Robot [Tue, 13 Sep 2016 04:29:36 +0000 (04:29 +0000)]
Merge "Remove incremental workaround for aapt overlays"

7 years agogoma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set.
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

7 years agoRemove incremental workaround for aapt overlays
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

7 years agoMerge "Remove speex from the pathmap"
Dan Willemsen [Tue, 13 Sep 2016 00:16:05 +0000 (00:16 +0000)]
Merge "Remove speex from the pathmap"
am: fbfff3129e

Change-Id: I3e1460124b235555860296363c065e24f872991c

7 years agoMerge "Remove speex from the pathmap"
Treehugger Robot [Tue, 13 Sep 2016 00:07:28 +0000 (00:07 +0000)]
Merge "Remove speex from the pathmap"

7 years agoRemove 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

7 years agoMerge "Update NDK gtest lib names."
Dan Albert [Mon, 12 Sep 2016 21:00:26 +0000 (21:00 +0000)]
Merge "Update NDK gtest lib names."
am: 56c2a18a50

Change-Id: Ib8b6996027020fa8bc1d17f8d1286915c534d94b

7 years agoMerge "Update NDK gtest lib names."
Treehugger Robot [Mon, 12 Sep 2016 20:48:42 +0000 (20:48 +0000)]
Merge "Update NDK gtest lib names."

7 years agoMerge "Fix libgcov.a dependency"
Dan Willemsen [Mon, 12 Sep 2016 19:16:41 +0000 (19:16 +0000)]
Merge "Fix libgcov.a dependency"
am: f9d5fb97cb

Change-Id: I38c4783f80976cc6cdf1dd3066d9bd9680efb4a8

7 years agoMerge "Fix libgcov.a dependency"
Treehugger Robot [Mon, 12 Sep 2016 19:06:54 +0000 (19:06 +0000)]
Merge "Fix libgcov.a dependency"

7 years agoFix 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

7 years agoMerge "Update build rules for VDEX"
David Brazdil [Mon, 12 Sep 2016 15:05:39 +0000 (15:05 +0000)]
Merge "Update build rules for VDEX"
am: 3a04e1b82f

Change-Id: I6f50ba38c35277892ecc1fcc262eed9ffa533aa5

7 years agoMerge "Update build rules for VDEX"
David Brazdil [Mon, 12 Sep 2016 14:57:19 +0000 (14:57 +0000)]
Merge "Update build rules for VDEX"

7 years agoMerge "Remove global linker search paths"
Colin Cross [Fri, 9 Sep 2016 20:34:29 +0000 (20:34 +0000)]
Merge "Remove global linker search paths"
am: 39c1c9ae12

Change-Id: I3eddb29f5e0c0d4fe3d5bc012c27c11509e3de8d

7 years agoMerge "Remove global linker search paths"
Colin Cross [Fri, 9 Sep 2016 20:27:21 +0000 (20:27 +0000)]
Merge "Remove global linker search paths"

7 years agoRemove 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

7 years agoUpdate build rules for VDEX
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

7 years agoUpdate NDK gtest lib names.
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

7 years agoMerge "Prevent Kati from seeing MAKEFLAGS"
Dan Willemsen [Fri, 9 Sep 2016 01:35:51 +0000 (01:35 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS"
am: 6b363e24bd

Change-Id: I8bc18aa66c7b621ed90d82412b6c29e72334f3f1

7 years agoMerge "Prevent Kati from seeing MAKEFLAGS"
Treehugger Robot [Fri, 9 Sep 2016 01:25:21 +0000 (01:25 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS"

7 years agoPrevent 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

7 years agoMerge "Blacklist the GOMACC_PATH environment variable"
Dan Willemsen [Thu, 8 Sep 2016 20:52:34 +0000 (20:52 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable"
am: b2498a22c2

Change-Id: I987d05196b3b15f5019f7a9497867fa9c39cec12

7 years agoMerge "Blacklist the GOMACC_PATH environment variable"
Dan Willemsen [Thu, 8 Sep 2016 20:47:19 +0000 (20:47 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable"

7 years agoMerge "Define DEFAULT_TIDY_HEADER_DIRS."
Chih-hung Hsieh [Thu, 8 Sep 2016 20:34:34 +0000 (20:34 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
am: 9d66e2c2ef

Change-Id: Ifbcded2a3d1f0852ba348fc7954e835c05760d5a

7 years agoMerge "Define DEFAULT_TIDY_HEADER_DIRS."
Chih-hung Hsieh [Thu, 8 Sep 2016 20:24:07 +0000 (20:24 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS."

7 years agoBlacklist the GOMACC_PATH environment variable
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

7 years agoMerge ""SignApk" in Created-By header"
Alex Klyubin [Thu, 8 Sep 2016 17:18:01 +0000 (17:18 +0000)]
Merge ""SignApk" in Created-By header"
am: 6e85eeaf53

Change-Id: I5b87f9655b88bdeed5ccfccbf5b76e94243592f6

7 years agoMerge ""SignApk" in Created-By header"
Treehugger Robot [Thu, 8 Sep 2016 17:10:37 +0000 (17:10 +0000)]
Merge ""SignApk" in Created-By header"

7 years agoMerge "Build symlinks for -host and -target phony modules"
Colin Cross [Wed, 7 Sep 2016 22:05:18 +0000 (22:05 +0000)]
Merge "Build symlinks for -host and -target phony modules"
am: d81559e6ac

Change-Id: I133cae0be0a8328af1b9b186e7d47e4f46a11406

7 years agoMerge "Build symlinks for -host and -target phony modules"
Treehugger Robot [Wed, 7 Sep 2016 22:00:24 +0000 (22:00 +0000)]
Merge "Build symlinks for -host and -target phony modules"