OSDN Git Service

android-x86/build.git
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 "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 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 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"

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

7 years ago"SignApk" in Created-By header
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

7 years agoMerge "Add tool to copy files in to fat16 images"
Casey Dahlin [Wed, 7 Sep 2016 20:04:13 +0000 (20:04 +0000)]
Merge "Add tool to copy files in to fat16 images"
am: bfea84dabc

Change-Id: I9647fc5f7b96370a74e603cdd3fb29021e7905a6

7 years agoMerge "Add tool to copy files in to fat16 images"
Treehugger Robot [Wed, 7 Sep 2016 19:51:06 +0000 (19:51 +0000)]
Merge "Add tool to copy files in to fat16 images"

7 years agoMerge "Recognize new clang-tidy and Java warnings."
Chih-hung Hsieh [Wed, 7 Sep 2016 05:35:35 +0000 (05:35 +0000)]
Merge "Recognize new clang-tidy and Java warnings."
am: 0c9a2ee864

Change-Id: I81f6d78600d0a168dec75171bee5de01c5a068b2

7 years agoMerge "Recognize new clang-tidy and Java warnings."
Chih-hung Hsieh [Wed, 7 Sep 2016 05:27:45 +0000 (05:27 +0000)]
Merge "Recognize new clang-tidy and Java warnings."

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

7 years agoDefine DEFAULT_TIDY_HEADER_DIRS.
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

7 years agoMerge changes I65c3fa9a,Id1ea5e8b
Duane Sand [Tue, 6 Sep 2016 22:51:03 +0000 (22:51 +0000)]
Merge changes I65c3fa9a,Id1ea5e8b
am: 126ea5a55c

Change-Id: If6d054b480245d50315938a65dd07aca32449c84

7 years agoMerge changes I65c3fa9a,Id1ea5e8b
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

7 years agoMerge "Use full path in symbols zip file"
Dan Willemsen [Tue, 6 Sep 2016 21:52:06 +0000 (21:52 +0000)]
Merge "Use full path in symbols zip file"
am: 72dcbeb4bc

Change-Id: I6f5db95ec6f13d8562c14a484751c9d659eb226d

7 years agoMerge "Use full path in symbols zip file"
Treehugger Robot [Tue, 6 Sep 2016 21:40:19 +0000 (21:40 +0000)]
Merge "Use full path in symbols zip file"

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

7 years agoMerge "Remove HOST_PREFER_32_BIT"
Colin Cross [Sat, 3 Sep 2016 00:33:26 +0000 (00:33 +0000)]
Merge "Remove HOST_PREFER_32_BIT"
am: 182ff5e2e7

Change-Id: I1fdb2a963d2e2dded21ee91998388a68b9ea03a4

7 years agoMerge "Remove HOST_PREFER_32_BIT"
Colin Cross [Sat, 3 Sep 2016 00:29:41 +0000 (00:29 +0000)]
Merge "Remove HOST_PREFER_32_BIT"

7 years agoMerge "Create sub-directory for fuzzers under nativetest."
Vishwath Mohan [Fri, 2 Sep 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
am: 0464662888

Change-Id: I16b6652473326811c0ceac3cb9997ff82c6ada73

7 years agoMerge "Create sub-directory for fuzzers under nativetest."
Vishwath Mohan [Fri, 2 Sep 2016 21:27:41 +0000 (21:27 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."

7 years agoAdd tool to copy files in to fat16 images
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

7 years agoCreate sub-directory for fuzzers under nativetest.
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

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

7 years agoMerge "build_image: add padding to match partition size"
Sami Tolvanen [Fri, 2 Sep 2016 18:18:32 +0000 (18:18 +0000)]
Merge "build_image: add padding to match partition size"
am: ef5751c1ec

Change-Id: Ia06afb7351d15b6726bd92cdbe92fca8b5116da3

7 years agoMerge "build_image: add padding to match partition size"
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "build_image: add padding to match partition size"

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

7 years agoMerge "Walk up tree to find makefiles in mma"
Colin Cross [Thu, 1 Sep 2016 23:42:34 +0000 (23:42 +0000)]
Merge "Walk up tree to find makefiles in mma"
am: 5ccafd0f29

Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2

7 years agoMerge "Walk up tree to find makefiles in mma"
Treehugger Robot [Thu, 1 Sep 2016 23:34:52 +0000 (23:34 +0000)]
Merge "Walk up tree to find makefiles in mma"

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

7 years agoMerge "Canonicalize mmm path"
Colin Cross [Thu, 1 Sep 2016 17:15:40 +0000 (17:15 +0000)]
Merge "Canonicalize mmm path"
am: a5b02ff1ef

Change-Id: Ib9d8de38a7b5d63a2be023b538797df17c5451d5

7 years agoMerge "Canonicalize mmm path"
Treehugger Robot [Thu, 1 Sep 2016 17:04:49 +0000 (17:04 +0000)]
Merge "Canonicalize mmm path"

7 years agoMerge "Don't double-wrap with gomacc"
Colin Cross [Thu, 1 Sep 2016 16:09:29 +0000 (16:09 +0000)]
Merge "Don't double-wrap with gomacc"
am: b7a12806b1

Change-Id: If5e9b3a9dabfd3db9b16fe37e5ed0ffad956cfbb

7 years agoMerge "Don't double-wrap with gomacc"
Colin Cross [Thu, 1 Sep 2016 15:59:38 +0000 (15:59 +0000)]
Merge "Don't double-wrap with gomacc"

7 years agoCanonicalize mmm path
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

7 years agoMerge "Create more shortcut phony targets"
Colin Cross [Wed, 31 Aug 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Create more shortcut phony targets"
am: 44303e9f26

Change-Id: I0b42e1f01e7a0eb1b731459c581155b952e67a19

7 years agoMerge "Create more shortcut phony targets"
Colin Cross [Wed, 31 Aug 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Create more shortcut phony targets"

7 years agoDon't double-wrap with gomacc
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

7 years agoMerge "Enable goma in soong"
Colin Cross [Wed, 31 Aug 2016 20:18:49 +0000 (20:18 +0000)]
Merge "Enable goma in soong"
am: 753ed863c5

Change-Id: I10cd9f5f447124b0aff58b8aaf7a0fadafe3ac59

7 years agoMerge "Enable goma in soong"
Colin Cross [Wed, 31 Aug 2016 20:08:57 +0000 (20:08 +0000)]
Merge "Enable goma in soong"

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

7 years agoMerge "Simplify Soong bootstrapping"
Dan Willemsen [Wed, 31 Aug 2016 16:11:46 +0000 (16:11 +0000)]
Merge "Simplify Soong bootstrapping"
am: 2e5dc07c1f

Change-Id: I90835790fe8a2b6d526a8c345638c8380972beaa

7 years agoMerge "Simplify Soong bootstrapping"
Dan Willemsen [Wed, 31 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "Simplify Soong bootstrapping"

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

7 years agoCreate more shortcut phony targets
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

7 years agoMerge "Check USE_GOMA consistently"
Dan Willemsen [Mon, 29 Aug 2016 20:44:16 +0000 (20:44 +0000)]
Merge "Check USE_GOMA consistently"
am: 049dd57872

Change-Id: Ia838646334435a7bdbd862db2c7b2a697c791265

7 years agoMerge "Check USE_GOMA consistently"
Treehugger Robot [Mon, 29 Aug 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Check USE_GOMA consistently"

7 years agoMerge "Switch to prebuilt clang-3217047"
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:55:38 +0000 (19:55 +0000)]
Merge "Switch to prebuilt clang-3217047"
am: 3500ddfe1b

Change-Id: I9d9e8ef2be4158afa814279b073a1109a12f1970

7 years agoMerge "Switch to prebuilt clang-3217047"
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:38:34 +0000 (19:38 +0000)]
Merge "Switch to prebuilt clang-3217047"

7 years agoCheck USE_GOMA consistently
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

7 years agoMerge "Identify modules ready to be converted to Soong"
Dan Willemsen [Fri, 26 Aug 2016 22:49:04 +0000 (22:49 +0000)]
Merge "Identify modules ready to be converted to Soong"
am: c6bada8acd

Change-Id: Ia180357da71fbce20e0b06503fbc29481b2160af