OSDN Git Service

android-x86/build.git
8 years agoPack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 2 Oct 2015 00:38:09 +0000 (17:38 -0700)]
Pack META/ab_partitions.txt when using the A/B OTA updater.

The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.

Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip

Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac

8 years agoMerge "Have all targets in build.ninja"
Colin Cross [Thu, 1 Oct 2015 21:13:03 +0000 (21:13 +0000)]
Merge "Have all targets in build.ninja"

8 years agoMerge "Remove old grandfathered ALL_PREBUILTS"
Kenny Root [Thu, 1 Oct 2015 17:55:05 +0000 (17:55 +0000)]
Merge "Remove old grandfathered ALL_PREBUILTS"

8 years agoMerge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."
Stephen Hines [Thu, 1 Oct 2015 05:19:50 +0000 (05:19 +0000)]
Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."

8 years agoMerge "Only use a fixed timestamp when packaging."
Tao Bao [Wed, 30 Sep 2015 23:45:45 +0000 (23:45 +0000)]
Merge "Only use a fixed timestamp when packaging."

8 years agoOnly use a fixed timestamp when packaging.
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
Only use a fixed timestamp when packaging.

[1] changed to use a fixed timestamp for all the generated images
(either the one under $ANDROID_PRODUCT_OUT/ or the one added into the
target_files zip). It makes 'adb sync' after 'fastboot flashall' to
resync all the files. This CL changes to use a fixed timestamp only when
packaging into the target_files zip.

[1]: commit 052ae3542be93d30108e742c5c21d5c45d9b7cf8

Bug: 24377993
Bug: 24536411
Change-Id: I209318966109fd4902468dfe96caf777464f9fe1

8 years agoHave all targets in build.ninja
Colin Cross [Wed, 30 Sep 2015 22:41:51 +0000 (15:41 -0700)]
Have all targets in build.ninja

We should pass --gen_all_targets to have targets which are not declared
as .PHONY.  However, this triggers some nasty behavior inherited from
make, where targets can get variables from things that depend on them.
--gen_all_targets will traverse the targets starting at random points in
the dependency tree, and any variables set higher in the tree will not
be visible.  To work around this, keep --gen_all_phony_targets, which
will start traversing at the phony targets first.  This will enter the
tree traversal at points we know don't use inherited variables, like
checkbuild or the PARSE_TIME_MAKE_GOALS, and will reach all the
dependencies that use inherited variables in the right order.
--gen_all_targets will then fill in any remaining targets that were not
in the main dependency tree, and hopefully none of them use any
inherited variables.

Bug: 24384320
Change-Id: I1ff07b7ef26e9481baae678e7fe0933b6d05f2a7

8 years agoMerge "Sort more instances of wildcard and find"
Dan Willemsen [Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Sort more instances of wildcard and find"

8 years agoSort more instances of wildcard and find
Dan Willemsen [Tue, 29 Sep 2015 23:30:21 +0000 (16:30 -0700)]
Sort more instances of wildcard and find

Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.

Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3

8 years agoMerge "Add all-cpp-files-under"
Dan Willemsen [Wed, 30 Sep 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Add all-cpp-files-under"

8 years agoRemove old grandfathered ALL_PREBUILTS
Kenny Root [Wed, 30 Sep 2015 21:53:51 +0000 (14:53 -0700)]
Remove old grandfathered ALL_PREBUILTS

Many of the packages on ALL_PREBUILTS grandfathered list are no longer
in the tree. Remove them to whittle the list down, so we can tackle the
remaining items.

Change-Id: Id6c026727ed7bef36d1803719df05d2e50afc5cc

8 years agoMerge "envsetup.sh: Add 'provision' function."
David Zeuthen [Wed, 30 Sep 2015 21:45:40 +0000 (21:45 +0000)]
Merge "envsetup.sh: Add 'provision' function."

8 years agoMerge "Move ninja files to $(OUT_DIR)"
Colin Cross [Wed, 30 Sep 2015 21:35:52 +0000 (21:35 +0000)]
Merge "Move ninja files to $(OUT_DIR)"

8 years agoMove ninja files to $(OUT_DIR)
Colin Cross [Wed, 30 Sep 2015 04:37:40 +0000 (21:37 -0700)]
Move ninja files to $(OUT_DIR)

Move the ninja files from $(PRODUCT_OUT)/build.ninja to
$(OUT_DIR)/build-$(TARGET_PRODUCT).ninja.  This will improve incremental
builds of host modules after swithing target products, because the
.ninja_deps file will be accurate across builds.

Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7

8 years agoenvsetup.sh: Add 'provision' function.
David Zeuthen [Wed, 30 Sep 2015 21:10:48 +0000 (17:10 -0400)]
envsetup.sh: Add 'provision' function.

This will run ${ANDROID_PRODUCT_OUT}/provision-device which in turn can
run fastboot (and other vendor-specific bits, if needed) to repartition
the device and reflash all partitions with known versions. Options
passed to the 'provision' command will be passed on to said script which
is expected to pass them on to fastboot.

Since this is a rather destructive operation involving data loss etc.,
user confirmation is required. This confirmation can be bypassed using
the option --no-confirmation.

Change-Id: Iec5667f2f5070b95d2eb70ad1b2984909ae4184c

8 years agoMerge "Pack the update_engine_config.txt when using the A/B OTA updater."
Alex Deymo [Wed, 30 Sep 2015 18:08:20 +0000 (18:08 +0000)]
Merge "Pack the update_engine_config.txt when using the A/B OTA updater."

8 years agoPack the update_engine_config.txt when using the A/B OTA updater.
Alex Deymo [Wed, 30 Sep 2015 02:05:37 +0000 (19:05 -0700)]
Pack the update_engine_config.txt when using the A/B OTA updater.

This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.

Bug: 24406755
Test: `make dist` on Brillo.

Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576

8 years agoMerge "makeparallel needs global CFLAGS now"
Colin Cross [Wed, 30 Sep 2015 05:12:33 +0000 (05:12 +0000)]
Merge "makeparallel needs global CFLAGS now"

8 years agomakeparallel needs global CFLAGS now
Colin Cross [Wed, 30 Sep 2015 04:54:33 +0000 (21:54 -0700)]
makeparallel needs global CFLAGS now

After 3ad354951923f5c3593dd5f957ecd518126b41bc (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.

Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9

8 years agoAdd all-cpp-files-under
Dan Willemsen [Tue, 29 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Add all-cpp-files-under

There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.

Bug: 24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f

8 years agoMerge changes If34a7900,Iaea1f158
Colin Cross [Tue, 29 Sep 2015 22:41:42 +0000 (22:41 +0000)]
Merge changes If34a7900,Iaea1f158

* changes:
  Revert "Have all targets in build.ninja"
  Revert "Pass all goals to kati when "dist" is in goals"

8 years agoRevert "Have all targets in build.ninja"
Colin Cross [Tue, 29 Sep 2015 21:15:58 +0000 (14:15 -0700)]
Revert "Have all targets in build.ninja"

--gen_all_targets seems to be dropping some intermediate targets,
causing problems when kati is passed a goal and then ninja is run with
checkbuild as a goal, for example with:
m -j PRODUCT-aosp_flounder-userdebug checkbuild

This reverts commit 92bbf5667d2d16682477556cb55e0d2f0a3b1e14.

Change-Id: If34a790028f8da98fcc713e3f7000d06c63dcf80

8 years agoRevert "Pass all goals to kati when "dist" is in goals"
Colin Cross [Tue, 29 Sep 2015 20:20:47 +0000 (13:20 -0700)]
Revert "Pass all goals to kati when "dist" is in goals"

This isn't actually necessary, dist doesn't use MAKEDISTGOALS other than
to check if it contains any other real targets.  The real issue is
caused by --gen_all_targets, and is broader than just "dist".

This reverts commit d3701e9e967a7e1e97aa365af4c0080d3bad929e.

Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3

8 years agoMerge "Pack libdivsufsort.so into otatools.zip."
Tao Bao [Tue, 29 Sep 2015 17:38:14 +0000 (17:38 +0000)]
Merge "Pack libdivsufsort.so into otatools.zip."

8 years agoMerge "Pass all goals to kati when "dist" is in goals"
Colin Cross [Tue, 29 Sep 2015 17:09:03 +0000 (17:09 +0000)]
Merge "Pass all goals to kati when "dist" is in goals"

8 years agoMerge "Make linker configurable through environment."
Nicolas Geoffray [Tue, 29 Sep 2015 08:34:28 +0000 (08:34 +0000)]
Merge "Make linker configurable through environment."

8 years agoMerge "Have all targets in build.ninja"
Shinichiro Hamaji [Tue, 29 Sep 2015 06:55:33 +0000 (06:55 +0000)]
Merge "Have all targets in build.ninja"

8 years agoPass all goals to kati when "dist" is in goals
Shinichiro Hamaji [Tue, 29 Sep 2015 06:50:28 +0000 (15:50 +0900)]
Pass all goals to kati when "dist" is in goals

Bug: 24339367
Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872

8 years agoHave all targets in build.ninja
Shinichiro Hamaji [Tue, 29 Sep 2015 05:18:59 +0000 (14:18 +0900)]
Have all targets in build.ninja

We should pass --gen_all_targets instead of --gen_all_phony_targets
to have targets which are not declared as .PHONY.

Bug: 24384320
Change-Id: I616d8c74e6efd9d69b1a935cfc5116b716f100ff

8 years agoMerge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Shinichiro Hamaji [Tue, 29 Sep 2015 03:54:59 +0000 (03:54 +0000)]
Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

8 years agoMerge "Don't add dependencies on Makefiles when using ninja"
Colin Cross [Tue, 29 Sep 2015 01:09:51 +0000 (01:09 +0000)]
Merge "Don't add dependencies on Makefiles when using ninja"

8 years agoFix RS NDK usage so we always pull from "current" instead of NDK 8.
Stephen Hines [Tue, 29 Sep 2015 01:07:21 +0000 (18:07 -0700)]
Fix RS NDK usage so we always pull from "current" instead of NDK 8.

The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.

Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455

8 years agoPack libdivsufsort.so into otatools.zip.
Tao Bao [Mon, 28 Sep 2015 23:37:27 +0000 (16:37 -0700)]
Pack libdivsufsort.so into otatools.zip.

This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.

Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14

8 years agoDon't add dependencies on Makefiles when using ninja
Colin Cross [Mon, 28 Sep 2015 23:26:00 +0000 (16:26 -0700)]
Don't add dependencies on Makefiles when using ninja

Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.

Bug: 23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199

8 years agoMerge "Use zip -q for adding shared libraries"
Colin Cross [Mon, 28 Sep 2015 23:23:40 +0000 (23:23 +0000)]
Merge "Use zip -q for adding shared libraries"

8 years agoUse zip -q for adding shared libraries
Colin Cross [Mon, 28 Sep 2015 23:15:09 +0000 (16:15 -0700)]
Use zip -q for adding shared libraries

Make zip quiet when adding shared libraries to apks.

Bug: 24409581
Change-Id: I540510eb6e051b5fc9d1d2a7fa5565a5b774a602

8 years agoReland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Shinichiro Hamaji [Thu, 24 Sep 2015 05:33:27 +0000 (14:33 +0900)]
Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS

Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

This is a reland attempt of
https://android-review.googlesource.com/#/c/172800/

The two issues should have been fixed by Ying in internal trees.

Bug: 24339367
Change-Id: I8ba2254f9bff271da2a7aa7684fd3d987e07c9d3

8 years agoMerge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"
Colin Cross [Mon, 28 Sep 2015 23:00:46 +0000 (23:00 +0000)]
Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"

8 years agoSet BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
Colin Cross [Mon, 28 Sep 2015 22:36:05 +0000 (15:36 -0700)]
Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build

Distinguish between parsing makefiles in make for a pre-ninja build,
parsing makefiles in kati for a ninja build, and parsing makefiles in
make for a non-ninja build by leaving USE_NINJA=true enabled for the
kati pass but also setting BUILDING_WITH_NINJA.

Change-Id: I63f1ce1efe08cd86fdf41f8051901f720b38cfaf

8 years agoMerge "Remove "preparing StaticLib" messages"
Colin Cross [Mon, 28 Sep 2015 22:24:02 +0000 (22:24 +0000)]
Merge "Remove "preparing StaticLib" messages"

8 years agoRemove "preparing StaticLib" messages
Colin Cross [Mon, 28 Sep 2015 21:51:19 +0000 (14:51 -0700)]
Remove "preparing StaticLib" messages

The preparing StaticLib messages don't provide any useful information,
remove them to clean up build output.

Bug: 24409581
Change-Id: I81fa7c47fd0d10846a21667b6421b4777260d0e9

8 years agoMerge "build_image.py: Use a fixed timestamp in the generated image."
Tao Bao [Mon, 28 Sep 2015 21:09:23 +0000 (21:09 +0000)]
Merge "build_image.py: Use a fixed timestamp in the generated image."

8 years agobuild_image.py: Use a fixed timestamp in the generated image.
Tao Bao [Mon, 28 Sep 2015 20:44:13 +0000 (13:44 -0700)]
build_image.py: Use a fixed timestamp in the generated image.

Bug: 24377993
Change-Id: I9b1433c8c877dc2a391615bb016b8970426e9f70

8 years agoMerge "Package breakpad symbols in target files zip"
Steve Fung [Mon, 28 Sep 2015 20:07:55 +0000 (20:07 +0000)]
Merge "Package breakpad symbols in target files zip"

8 years agoMake linker configurable through environment.
Nicolas Geoffray [Fri, 25 Sep 2015 12:54:09 +0000 (13:54 +0100)]
Make linker configurable through environment.

Change-Id: I152ad7b41cfa05f2f59f51c6d8bd1e427f1a1649

8 years agoMerge "Use gomacc even for FDO build"
Shinichiro Hamaji [Mon, 28 Sep 2015 04:38:53 +0000 (04:38 +0000)]
Merge "Use gomacc even for FDO build"

8 years agoMerge "Remove checkbuild and test from parse time goals"
Colin Cross [Sat, 26 Sep 2015 03:33:35 +0000 (03:33 +0000)]
Merge "Remove checkbuild and test from parse time goals"

8 years agoUse gomacc even for FDO build
Shinichiro Hamaji [Thu, 24 Sep 2015 08:51:20 +0000 (17:51 +0900)]
Use gomacc even for FDO build

Goma's client recognizes -fprofile-use= flag so shoulde be
compatible with Android's FDO build.

Change-Id: I0d21d6f530cd05770f8dc12e9dc33a5db49a9c7d

8 years agoPackage breakpad symbols in target files zip
Steve Fung [Fri, 25 Sep 2015 01:12:33 +0000 (18:12 -0700)]
Package breakpad symbols in target files zip

When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
symbols into the target files zip thats generated with `make dist`.

Bug: 24165970
Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada

8 years agoMerge "Remove the unnecessary rs_compatibility_jni_libs install rules."
Ying Wang [Sat, 26 Sep 2015 01:00:14 +0000 (01:00 +0000)]
Merge "Remove the unnecessary rs_compatibility_jni_libs install rules."

8 years agoMerge "Fix windows build"
Colin Cross [Sat, 26 Sep 2015 00:09:58 +0000 (00:09 +0000)]
Merge "Fix windows build"

8 years agoFix windows build
Colin Cross [Sat, 26 Sep 2015 00:00:14 +0000 (17:00 -0700)]
Fix windows build

The windows toolchain doesn't support color, only apply
-fdiagnostics-color to HOST and TARGET, not HOST_CROSS.

Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608

8 years agoRemove checkbuild and test from parse time goals
Colin Cross [Fri, 25 Sep 2015 23:43:36 +0000 (16:43 -0700)]
Remove checkbuild and test from parse time goals

The tests goal is not a parse time goal.

The checkbuild goal is only a parse time goal so that it doesn't result
in a circular dependency between droid and checkbuild when
ANDROID_BUILD_EVERYTHING_BY_DEFAULT is set.  Get rid of the circular
dependency by making droid depend on droid_targets, and droid_targets
depend on the targets that are normally built for droid.  checkbuild can
then always depend on droid_targets, and droid can condtionally depend
on checkbuild without introducing a circular dependency.

Bug: 24413153
Change-Id: I231d80e05ffe321384a5efbcdf5578f86ad84da0

8 years agoMerge "Link libgtest_main before libgtest"
Colin Cross [Fri, 25 Sep 2015 23:30:48 +0000 (23:30 +0000)]
Merge "Link libgtest_main before libgtest"

8 years agoRemove the unnecessary rs_compatibility_jni_libs install rules.
Ying Wang [Fri, 25 Sep 2015 23:06:48 +0000 (16:06 -0700)]
Remove the unnecessary rs_compatibility_jni_libs install rules.

We only build rs_compatibility_jni_libs for unbundled build or when
FORCE_BUILD_RS_COMPAT is set. We don't need to install the
rs_compatibility_jni_libs to system.img in either case.

It's bad idea to install them to system.img, because when two modules
have .rs files with the same name, their installed files conflict.

Change-Id: I7524a301c59396db464f28b17b8f8bf1f15523ca

8 years agoLink libgtest_main before libgtest
Colin Cross [Fri, 25 Sep 2015 23:11:31 +0000 (16:11 -0700)]
Link libgtest_main before libgtest

libgtest_main uses symbols from libgtest.  If libgtest_main is linked
after libgtest, and the test .o files don't reference libgtest (which is
unlikely), then the libgtest .o files will be ignored and libgtest_main
won't be able to find its symbols from libgtest.

Change-Id: Ica3bc679bd9d14e9a3065be927f085cf52faab64

8 years agoMerge "Enable color output from gcc and clang"
Colin Cross [Fri, 25 Sep 2015 23:10:45 +0000 (23:10 +0000)]
Merge "Enable color output from gcc and clang"

8 years agoMerge "releasetools: Update the fingerprint when signing."
Tao Bao [Fri, 25 Sep 2015 19:42:28 +0000 (19:42 +0000)]
Merge "releasetools: Update the fingerprint when signing."

8 years agoreleasetools: Update the fingerprint when signing.
Tao Bao [Fri, 11 Sep 2015 22:27:56 +0000 (15:27 -0700)]
releasetools: Update the fingerprint when signing.

ro.bootimage.build.fingerprint should be updated when signing.

Bug: 22720426
Bug: 24009888
Change-Id: Ib246a257581fd31f90ad6b3d21f39d1a2de24ba8
(cherry picked from commit 265d9aeb622c5829787b16b903f028cacaa99c18)

8 years agoMerge "GPU: add gralloc.ranchu library"
David Turner [Fri, 25 Sep 2015 16:59:31 +0000 (16:59 +0000)]
Merge "GPU: add gralloc.ranchu library"

8 years agoMerge "Set mcpu targets based on cpu variant."
Christopher Ferris [Fri, 25 Sep 2015 16:29:33 +0000 (16:29 +0000)]
Merge "Set mcpu targets based on cpu variant."

8 years agoEnable color output from gcc and clang
Colin Cross [Fri, 25 Sep 2015 05:14:25 +0000 (22:14 -0700)]
Enable color output from gcc and clang

Force gcc and clang to always output color diagnostics.  Ninja will
strip the ANSI color codes if it is not running in a terminal.

Bug: 24273983
Change-Id: Ic9252549bfacf3bbb3f4b9d20f63010fc24ac21d

8 years agoMerge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
Shinichiro Hamaji [Fri, 25 Sep 2015 05:27:59 +0000 (05:27 +0000)]
Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""

8 years agoRevert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Shinichiro Hamaji [Fri, 25 Sep 2015 05:20:42 +0000 (14:20 +0900)]
Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

This reverts commit cb31f040e304e7d7b2a08d3fd8eceb72c878c37e.

This could be the cause of an internal build breakage.

Change-Id: Ic5d2a2ce1f2d214a8201db5c570682d8336763b9

8 years agoMerge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Shinichiro Hamaji [Fri, 25 Sep 2015 04:59:29 +0000 (04:59 +0000)]
Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

8 years agoOnly put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Shinichiro Hamaji [Thu, 24 Sep 2015 05:33:27 +0000 (14:33 +0900)]
Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS

Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

Bug: 24339367
Change-Id: I63237160c3c86817b53635665d56906790ec4e6a

8 years agoMerge "Make it possible to change the number of remote jobs"
Shinichiro Hamaji [Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)]
Merge "Make it possible to change the number of remote jobs"

8 years agoMerge "Allow USE_GOMA=true without explicit USE_NINJA=true"
Shinichiro Hamaji [Fri, 25 Sep 2015 04:23:28 +0000 (04:23 +0000)]
Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"

8 years agoMerge "Revert "disable Krait for Mac builds to avoid assembler issues""
Colin Cross [Fri, 25 Sep 2015 01:07:52 +0000 (01:07 +0000)]
Merge "Revert "disable Krait for Mac builds to avoid assembler issues""

8 years agoRevert "disable Krait for Mac builds to avoid assembler issues"
Colin Cross [Fri, 25 Sep 2015 00:30:34 +0000 (00:30 +0000)]
Revert "disable Krait for Mac builds to avoid assembler issues"

This doesn't seem to be a problem any more, and mac builds
that differ from linux builds is causing other problems.

This reverts commit 7c40fb95dc90ed092f435c769b4bbb494d453674.

Bug: 24339250
Change-Id: I8a0da11df42d58ba9c3ded4571f1db870f400a21

8 years agoMerge "Generate breakpad symbols"
Steve Fung [Thu, 24 Sep 2015 23:57:42 +0000 (23:57 +0000)]
Merge "Generate breakpad symbols"

8 years agoMerge "Substitue "/" with "-" in the MODULES-IN phony goal names."
Ying Wang [Thu, 24 Sep 2015 23:53:24 +0000 (23:53 +0000)]
Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."

8 years agoGenerate breakpad symbols
Steve Fung [Thu, 24 Sep 2015 08:40:52 +0000 (01:40 -0700)]
Generate breakpad symbols

When BREAKPAD_GENERATE_SYMBOLS is set to true, generate breakpad
symbols for binaries.

Bug: 23900817
Change-Id: I7b992d819350f4f80df5868d16f13016502dfca0

8 years agoSubstitue "/" with "-" in the MODULES-IN phony goal names.
Ying Wang [Thu, 24 Sep 2015 23:19:19 +0000 (16:19 -0700)]
Substitue "/" with "-" in the MODULES-IN phony goal names.

This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e

8 years agoMerge "Remove more of the pathmap."
Elliott Hughes [Thu, 24 Sep 2015 21:50:42 +0000 (21:50 +0000)]
Merge "Remove more of the pathmap."

8 years agoMerge "Use exported includes for libc++."
Dan Albert [Thu, 24 Sep 2015 21:38:21 +0000 (21:38 +0000)]
Merge "Use exported includes for libc++."

8 years agoUse exported includes for libc++.
Dan Albert [Wed, 23 Sep 2015 23:16:51 +0000 (16:16 -0700)]
Use exported includes for libc++.

Change-Id: Ia5d9c857a43975448a8c2b489cc29be0fa67ddf6

8 years agoSet mcpu targets based on cpu variant.
Christopher Ferris [Fri, 18 Sep 2015 01:49:27 +0000 (18:49 -0700)]
Set mcpu targets based on cpu variant.

Make cortex-a53 and cortex-a53.a57 use cortex-a7.

Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2

8 years agoMerge "Turn shared library multilib warnings into errors"
Dan Willemsen [Thu, 24 Sep 2015 20:59:20 +0000 (20:59 +0000)]
Merge "Turn shared library multilib warnings into errors"

8 years agoTurn shared library multilib warnings into errors
Dan Willemsen [Thu, 24 Sep 2015 20:05:53 +0000 (13:05 -0700)]
Turn shared library multilib warnings into errors

When caught later, these just get turned into warnings with
unpredictable results, or non-obvious errors.

Change-Id: Ie7ba88e97dc5bedd6cf850748d79693711ac41da

8 years agoGPU: add gralloc.ranchu library
Miroslav Tisma [Wed, 23 Sep 2015 10:53:41 +0000 (12:53 +0200)]
GPU: add gralloc.ranchu library

Change-Id: I76b21f67e081d82ec76242c051569f32b2b6b638

8 years agoMerge "The pattern %tests is too broad."
Ying Wang [Thu, 24 Sep 2015 18:40:15 +0000 (18:40 +0000)]
Merge "The pattern %tests is too broad."

8 years agoThe pattern %tests is too broad.
Ying Wang [Thu, 24 Sep 2015 18:34:46 +0000 (11:34 -0700)]
The pattern %tests is too broad.

We had fixed the filtering of %tests in art/Android.mk.
Actually the %tests leads to false build<suffix>.ninja when you run:
$ mmma cts/tests/tests/nativeopengl/libnativeopengltests
because the new mmma calls make with goals like
MODULES-IN/cts/tests/tests/nativeopengl/libnativeopengltests .

Bug: 24309760
Change-Id: I35af2e8d046ae40f3b90ec0a92473fcab8ff5db5

8 years agoRemove more of the pathmap.
Elliott Hughes [Thu, 24 Sep 2015 16:02:19 +0000 (09:02 -0700)]
Remove more of the pathmap.

I've fixed libpagemap to export its headers, the only user of the
libnativehelper entry was in this file anyway, and no one was using
the libhost entry.

Change-Id: Id0d1773e55c0114ccc56cefd783689193a6204f9

8 years agoMake it possible to change the number of remote jobs
Shinichiro Hamaji [Thu, 24 Sep 2015 07:22:44 +0000 (16:22 +0900)]
Make it possible to change the number of remote jobs

User can overwrite NINJA_REMOTE_NUM_JOBS for this purpose. The
number is passed to ninja instead of to kati so no we don't
need to regenerate a ninja file when a user changes this value.

Change-Id: I2ccfaaae4492d84a8b8045dff612cb5f6ebe2c79

8 years agoAllow USE_GOMA=true without explicit USE_NINJA=true
Shinichiro Hamaji [Thu, 24 Sep 2015 06:19:08 +0000 (15:19 +0900)]
Allow USE_GOMA=true without explicit USE_NINJA=true

Now ninja build is disabled only with USE_NINJA=false. So goma.mk
should fail with an error only when USE_NINJA=false is explicitly
specified.

Change-Id: I2fb913433d5c1e93ed2a9bd93bb5000cabd835a4

8 years agoMerge "Re-implement mma/mmma using make goals."
Ying Wang [Thu, 24 Sep 2015 01:20:05 +0000 (01:20 +0000)]
Merge "Re-implement mma/mmma using make goals."

8 years agoMerge "Sort all files found via $(shell find)"
Dan Willemsen [Thu, 24 Sep 2015 00:55:27 +0000 (00:55 +0000)]
Merge "Sort all files found via $(shell find)"

8 years agoMerge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"
Dan Willemsen [Thu, 24 Sep 2015 00:42:26 +0000 (00:42 +0000)]
Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"

8 years agoMerge "Don't add CFLAGS to CPPFLAGS"
Dan Willemsen [Thu, 24 Sep 2015 00:23:27 +0000 (00:23 +0000)]
Merge "Don't add CFLAGS to CPPFLAGS"

8 years agoRemove trailing / for HOST_TOOLCHAIN_FOR_CLANG
Dan Willemsen [Tue, 22 Sep 2015 23:52:18 +0000 (16:52 -0700)]
Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG

The darwin version doesn't have a trailing slash. The common case is to
append a path to it:

  $(HOST_TOOLCHAIN_FOR_CLANG)/lib/...

Which means we end up with two slashes.

Change-Id: I74e88924ecfd092c5f7871e188ede0aab29cf65b

8 years agoMerge changes I3ca9ed36,Ibd7eec5c
Dan Albert [Wed, 23 Sep 2015 23:42:13 +0000 (23:42 +0000)]
Merge changes I3ca9ed36,Ibd7eec5c

* changes:
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."

8 years agoRe-implement mma/mmma using make goals.
Ying Wang [Wed, 23 Sep 2015 23:08:55 +0000 (16:08 -0700)]
Re-implement mma/mmma using make goals.

Previously we use command line variable BUILD_MODULES_IN_PATHS which
causes kati to regenerate build.ninja if any variable value changes.

TODO: Remove the old rules of BUILD_MODULES_IN_PATHS in
build/core/main.mk and ninja.mk once users have re-sourced envsetup.sh.
Probably in a few weeks.

Caveat: With this change, if a user sources the new envsetup.sh, mma/mmma
won't work in old branches from the same shell.

Bug: 24309760
Change-Id: I212e82aeebaaa2bd4114e2066f1995da8886b5e2

8 years agoDon't add CFLAGS to CPPFLAGS
Dan Willemsen [Tue, 22 Sep 2015 23:52:58 +0000 (16:52 -0700)]
Don't add CFLAGS to CPPFLAGS

Except for kati, we never use COMMON_GLOBAL_CPPFLAGS without also using
COMMON_GLOBAL_CFLAGS, which leads to duplicate command line entries.

Change-Id: I25d625924e9d157175a9e88bc3f15b7214cfb4ed

8 years agoRevert "Default to hiding libgcc symbols in each object."
Dan Albert [Wed, 23 Sep 2015 23:17:28 +0000 (16:17 -0700)]
Revert "Default to hiding libgcc symbols in each object."

This reverts commit 021b7651a5fcb806d1b8a767c7f4a0a81bc8e4ff.

Bug: http://b/24166967
Change-Id: I3ca9ed36fa3b55c7eb129c209903676879720acd

8 years agoRevert "Don't apply --exclude-libs for the host."
Dan Albert [Wed, 23 Sep 2015 23:17:15 +0000 (16:17 -0700)]
Revert "Don't apply --exclude-libs for the host."

This reverts commit 1576da248c4a061d906778c2c1dac7478abcc510.

Bug: http://b/24166967
Change-Id: Ibd7eec5c261e85a0474243991be7ee1860c9e14d

8 years agoSort all files found via $(shell find)
Dan Willemsen [Tue, 22 Sep 2015 23:54:12 +0000 (16:54 -0700)]
Sort all files found via $(shell find)

Don't rely on filesystem ordering to make these the same for all builds.

Change-Id: I7313062157764091acecf45f4b57405c28858546

8 years agoMerge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
Colin Cross [Wed, 23 Sep 2015 21:53:08 +0000 (21:53 +0000)]
Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""

8 years agoRevert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Colin Cross [Wed, 23 Sep 2015 21:48:34 +0000 (21:48 +0000)]
Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

If there are any goals on the command line, kati hides targets that are
not dependencies of those goals.  Revert this until kati is modified to
include all targets.

This reverts commit b71d24931c7a18799249e3c7f7f6de20ac76cc75.

Bug: 24339367
Change-Id: I7c3a950aef8efc9a0eb72bd29ee07710d2faca99

8 years agoMerge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Colin Cross [Wed, 23 Sep 2015 20:54:16 +0000 (20:54 +0000)]
Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"