OSDN Git Service
Bill Yi [Wed, 23 Sep 2015 19:38:58 +0000 (12:38 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd
Evgenii Stepanov [Fri, 18 Sep 2015 20:31:54 +0000 (20:31 +0000)]
am
908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit '
908260a56631cad51196c7b197f720bc88d7f5c7':
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
Evgenii Stepanov [Fri, 18 Sep 2015 20:21:54 +0000 (20:21 +0000)]
Merge "Add support of SANITIZE_TARGET='address coverage' for fuzzing."
Ivan Krasin [Fri, 18 Sep 2015 18:54:43 +0000 (11:54 -0700)]
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.
Bug:
22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
Dan Albert [Fri, 18 Sep 2015 17:29:22 +0000 (17:29 +0000)]
am
000e1a97: Merge "Don\'t re-export libgcc symbols from every object."
* commit '
000e1a973ec83cb2af644ce72a46f1c026299a7d':
Don't re-export libgcc symbols from every object.
Dan Albert [Fri, 18 Sep 2015 17:21:13 +0000 (17:21 +0000)]
Merge "Don't re-export libgcc symbols from every object."
Dan Albert [Thu, 17 Sep 2015 22:04:54 +0000 (15:04 -0700)]
Don't re-export libgcc symbols from every object.
Target modules shouldn't re-export libgcc.a because we don't want
other binaries importing them when they should be getting their own
copy of the builtins.
Bug: http://b/
24166967
Change-Id: Iaa208933885375da4a8e1b8935f76e9f3ea0647f
Scott James Remnant [Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)]
am
909fe8e0: Merge "build: support compiling .mm on host"
* commit '
909fe8e0f7da8db09a004ef44a90e786c81df5e4':
build: support compiling .mm on host
Scott James Remnant [Thu, 17 Sep 2015 23:11:10 +0000 (23:11 +0000)]
Merge "build: support compiling .mm on host"
Scott James Remnant [Thu, 17 Sep 2015 22:40:49 +0000 (15:40 -0700)]
build: support compiling .mm on host
libchrome uses .mm (Objective-C++) files to bridge C++ code with
OS X Frameworks. This adds support for compiling .mm to .o by just
using the existing C++ support.
Bug:
24168923
Change-Id: Ia65357e2e2584dfffcb6796e214fe6b27635c3a6
Dan Albert [Wed, 16 Sep 2015 23:31:41 +0000 (23:31 +0000)]
am
3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
* commit '
3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
Remove WITHOUT_(HOST|TARGET)_CLANG.
Dan Albert [Wed, 16 Sep 2015 23:24:40 +0000 (23:24 +0000)]
Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
Ying Wang [Wed, 16 Sep 2015 23:21:04 +0000 (23:21 +0000)]
am
6fb36397: Merge "Use /ninja_build to mark ninja build."
* commit '
6fb36397e56336e08a75e7101d6d47a98a27aea1':
Use $(OUT_DIR)/ninja_build to mark ninja build.
Ying Wang [Wed, 16 Sep 2015 23:12:37 +0000 (23:12 +0000)]
Merge "Use $(OUT_DIR)/ninja_build to mark ninja build."
Dan Albert [Wed, 16 Sep 2015 22:35:39 +0000 (15:35 -0700)]
Remove WITHOUT_(HOST|TARGET)_CLANG.
This is unused.
Change-Id: Ibc461fef02c82d110718003aceffb943c930ffe6
Ying Wang [Wed, 16 Sep 2015 22:29:08 +0000 (15:29 -0700)]
Use $(OUT_DIR)/ninja_build to mark ninja build.
Bug:
23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
Ying Wang [Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)]
am
45075cf6: Merge "Generate installed-files-vendor.txt"
* commit '
45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
Ying Wang [Tue, 15 Sep 2015 23:09:38 +0000 (23:09 +0000)]
am
6eb3d977: Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"
* commit '
6eb3d977c5a8b7612058f1a55e648f8200de2b8f':
Remove legacy kernel build toolchain PATH setup in envsetup.sh
Ying Wang [Tue, 15 Sep 2015 21:52:13 +0000 (21:52 +0000)]
Merge "Generate installed-files-vendor.txt"
Ying Wang [Tue, 15 Sep 2015 21:22:12 +0000 (14:22 -0700)]
Generate installed-files-vendor.txt
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.
Bug:
24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
Ying Wang [Tue, 15 Sep 2015 17:04:48 +0000 (17:04 +0000)]
Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"
Ying Wang [Tue, 15 Sep 2015 02:32:50 +0000 (19:32 -0700)]
Remove legacy kernel build toolchain PATH setup in envsetup.sh
We used to rely on envsetup.sh to set up PATH before doing kernel build.
Now we have new kernel build process.
Also the variable doesn't work any more as we don't have corresponding arm-eabi
toolchain for the latest arm-linux-androideabi toolchain.
Change-Id: I99443fdc58e94f57f4f1f7e88da6dd127f3b2fac
Dan Willemsen [Tue, 15 Sep 2015 00:35:13 +0000 (00:35 +0000)]
am
b384eb84: Merge "kati: Handle MAKECMDGOALS modifications"
* commit '
b384eb84c3bbea9630d805f5825320e7f9acc2ba':
kati: Handle MAKECMDGOALS modifications
Dan Willemsen [Tue, 15 Sep 2015 00:28:42 +0000 (00:28 +0000)]
Merge "kati: Handle MAKECMDGOALS modifications"
Colin Cross [Tue, 15 Sep 2015 00:25:06 +0000 (00:25 +0000)]
am
4ce3cea7: Merge changes I6e4f957c,Id41a2d81
* commit '
4ce3cea77065396b81a4e50283b785e9cc64788f':
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
Colin Cross [Tue, 15 Sep 2015 00:18:43 +0000 (00:18 +0000)]
Merge changes I6e4f957c,Id41a2d81
* changes:
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
Dan Willemsen [Mon, 14 Sep 2015 23:30:51 +0000 (16:30 -0700)]
kati: Handle MAKECMDGOALS modifications
For some special targets (PRODUCT-%), the MAKECMDGOALS variable is
modified. Before this change, using one would result in a "no rule to
make target" error, since the new target was not stubbed out.
Change-Id: I879642a48b84a66789d4bdb7db1b6fd1130819b7
Colin Cross [Sun, 6 Sep 2015 07:35:21 +0000 (00:35 -0700)]
Use makeparallel to propagate -j flag to ninja or kati
When USE_NINJA=true is set, use makeparallel to claim all jobs from make and
pass them to ninja with -j. If USE_GOMA is set, pass the -j flag to
kati instead so the parallelism can be set in the local_pool instead.
Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
Colin Cross [Sun, 6 Sep 2015 04:16:19 +0000 (21:16 -0700)]
Implement makeparallel
makeparallel communicates with the GNU make jobserver
(http://make.mad-scientist.net/papers/jobserver-implementation/)
in order claim all available jobs, and then passes the number of jobs
claimed to a subprocess with -j<jobs>.
Change-Id: Id41a2d81e0d835517da8ba52c818c763fc455c14
Dan Albert [Fri, 11 Sep 2015 22:14:30 +0000 (22:14 +0000)]
am
da196abf: Merge "Fix `LOCAL_CXX_STL := none` for Windows."
* commit '
da196abf10fd9a500fe223952d96cf93ed699983':
Fix `LOCAL_CXX_STL := none` for Windows.
Dan Albert [Fri, 11 Sep 2015 20:44:46 +0000 (20:44 +0000)]
Merge "Fix `LOCAL_CXX_STL := none` for Windows."
Dan Albert [Fri, 11 Sep 2015 17:57:14 +0000 (10:57 -0700)]
Fix `LOCAL_CXX_STL := none` for Windows.
We still need to link the various MSVC libraries even if we aren't
using the STL.
Bug: http://b/
22953515
Change-Id: I73c35710a6162408e99480a4840eedd291adf7ab
Shinichiro Hamaji [Thu, 10 Sep 2015 03:37:24 +0000 (03:37 +0000)]
am
6d20af03: Merge "Use the same build.ninja for normal make targets"
* commit '
6d20af0391569a2f7b70a6816ddaf316b15e5a70':
Use the same build.ninja for normal make targets
Shinichiro Hamaji [Thu, 10 Sep 2015 03:31:59 +0000 (03:31 +0000)]
Merge "Use the same build.ninja for normal make targets"
Dan Willemsen [Thu, 10 Sep 2015 00:53:08 +0000 (00:53 +0000)]
am
96d3c0d0: Merge "Update the build system doc"
* commit '
96d3c0d0b14e94583438d9e93f011b1b0c930e38':
Update the build system doc
Dan Willemsen [Thu, 10 Sep 2015 00:45:59 +0000 (00:45 +0000)]
Merge "Update the build system doc"
Dan Willemsen [Wed, 9 Sep 2015 23:51:09 +0000 (16:51 -0700)]
Update the build system doc
This adds a reference to the _{32|64|arm|arm64|...|darwin|linux|windows}
variables, and adds information about how LOCAL_MODULE_HOST_OS works.
It also removes many (but not all) obsolete references.
Bug:
23566667
Change-Id: Ief16a5e245eb65ac00fc23d4fc1b7a409a7a64bd
Dan Willemsen [Wed, 9 Sep 2015 23:25:11 +0000 (23:25 +0000)]
am
c8db47a0: Merge "Don\'t build windows modules with clang, fix flags"
* commit '
c8db47a0213aa5c204c140cb9268389b4175ae06':
Don't build windows modules with clang, fix flags
Dan Willemsen [Wed, 9 Sep 2015 23:17:47 +0000 (23:17 +0000)]
Merge "Don't build windows modules with clang, fix flags"
Dan Willemsen [Wed, 9 Sep 2015 22:45:21 +0000 (15:45 -0700)]
Don't build windows modules with clang, fix flags
shamu checkbuilds set USE_CLANG_PLATFORM_BUILD, which shouldn't apply to
modules built for windows. Also fix some flags that were being set
improperly.
Bug:
23566667
Change-Id: Id4c5b7cc59966328483d90f2b7be3f35e439ecee
Tao Bao [Wed, 9 Sep 2015 19:39:40 +0000 (19:39 +0000)]
am
c5fe3f11: Merge "releasetools: Fix the expected total blocks."
* commit '
c5fe3f117d79ed9ddb6e77fbf211a87dc5dffed4':
releasetools: Fix the expected total blocks.
Tao Bao [Wed, 9 Sep 2015 19:29:59 +0000 (19:29 +0000)]
Merge "releasetools: Fix the expected total blocks."
Tao Bao [Wed, 9 Sep 2015 18:55:01 +0000 (11:55 -0700)]
releasetools: Fix the expected total blocks.
With the change in [1], it zeroes out extra blocks that might be read
by dm-verity. We should update the expected number of blocks that get
touched.
[1] commit
e9b619108dbe0c358ba6c14e27c92a623a7c1059.
Bug:
23786644
Change-Id: I7a7c3531e5af6bf381d3a14832e77abfa9a8efce
Dan Willemsen [Wed, 9 Sep 2015 18:19:13 +0000 (18:19 +0000)]
am
f1c09d7f: Merge "Add HOST_CROSS_OS"
* commit '
f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
Add HOST_CROSS_OS
Dan Albert [Wed, 9 Sep 2015 18:19:11 +0000 (18:19 +0000)]
am
feb3ecaf: Merge "Fix name for NDK protobuf libraries."
* commit '
feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
Fix name for NDK protobuf libraries.
Dan Willemsen [Wed, 9 Sep 2015 18:13:21 +0000 (18:13 +0000)]
Merge "Add HOST_CROSS_OS"
Dan Albert [Wed, 9 Sep 2015 18:13:16 +0000 (18:13 +0000)]
Merge "Fix name for NDK protobuf libraries."
Dan Willemsen [Fri, 14 Aug 2015 19:59:50 +0000 (12:59 -0700)]
Add HOST_CROSS_OS
Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.
Bug:
23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
Shinichiro Hamaji [Fri, 4 Sep 2015 05:38:37 +0000 (14:38 +0900)]
Use the same build.ninja for normal make targets
$(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect
parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))).
If the make targets contain one of them, we keep using a
different build.ninja for each combination of make targets.
Otherwise, we use the same build.ninja which has all phony
targets.
Also load vendor/google/build/ninja_config.mk so it can add
Google-specific goals to $(PARSE_TIME_MAKE_GOALS).
Bug:
23685536
Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
Tao Bao [Tue, 8 Sep 2015 22:33:16 +0000 (22:33 +0000)]
am
10b2e62b: Merge "releasetools: Don\'t write empty groups."
* commit '
10b2e62b6d45dc4b406be1544fd9b25d6f800e89':
releasetools: Don't write empty groups.
Tao Bao [Tue, 8 Sep 2015 22:25:42 +0000 (22:25 +0000)]
Merge "releasetools: Don't write empty groups."
Tao Bao [Tue, 8 Sep 2015 20:39:40 +0000 (13:39 -0700)]
releasetools: Don't write empty groups.
For a DataImage, we may have no mapping of ZERO or NONZERO blocks. Don't
write those groups if they are empty.
Bug:
19024504
Change-Id: I1e921effcdbf0661d4f4b541c104dd456ac0c582
Tao Bao [Tue, 8 Sep 2015 17:50:25 +0000 (17:50 +0000)]
am
16656668: Merge "releasetools: Always write the last block if it\'s padded."
* commit '
16656668e1cca5b62ca4487206c462b93bf5a0fc':
releasetools: Always write the last block if it's padded.
Dan Albert [Tue, 8 Sep 2015 17:47:03 +0000 (10:47 -0700)]
Fix name for NDK protobuf libraries.
Name them *-ndk so it's clear which library is which.
Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
Tao Bao [Tue, 8 Sep 2015 17:41:47 +0000 (17:41 +0000)]
Merge "releasetools: Always write the last block if it's padded."
Shinichiro Hamaji [Mon, 7 Sep 2015 05:44:30 +0000 (05:44 +0000)]
am
e711afb1: Merge "Use as a part of ninja suffix"
* commit '
e711afb154333407fe42e8ffe36bf76448d4f80f':
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
Shinichiro Hamaji [Mon, 7 Sep 2015 05:38:24 +0000 (05:38 +0000)]
Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix"
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
23828506
Change-Id: I4b0af7344d18261258cd48d18c029c089d6ff365
Dan Willemsen [Sat, 5 Sep 2015 01:29:56 +0000 (01:29 +0000)]
am
76274670: Merge "Fix LOCAL_MODULE_HOST_OS"
* commit '
762746705c7414985dbd457481dd33d4c69adcbb':
Fix LOCAL_MODULE_HOST_OS
Dan Willemsen [Sat, 5 Sep 2015 01:25:16 +0000 (01:25 +0000)]
Merge "Fix LOCAL_MODULE_HOST_OS"
Shinichiro Hamaji [Fri, 4 Sep 2015 02:41:33 +0000 (11:41 +0900)]
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
So that switching between two different mmma targets won't
need regenerating ninja files.
Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
Dan Willemsen [Fri, 4 Sep 2015 22:08:08 +0000 (15:08 -0700)]
Fix LOCAL_MODULE_HOST_OS
Make sure LOCAL_IS_HOST_MODULE is set before including
module_arch_supported.mk
Bug:
23566667
Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241
Ying Wang [Fri, 4 Sep 2015 17:56:24 +0000 (17:56 +0000)]
am
af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk."
* commit '
af72e1b3e68f449c81054bc25e655016529914e1':
Move part of logtags stuff back to base_rules.mk.
Tao Bao [Fri, 4 Sep 2015 17:56:22 +0000 (17:56 +0000)]
am
8f4b307e: Merge "releasetools: Fix the bug when deleting files."
* commit '
8f4b307e56ea73153f249b44dc2b15de77e058f7':
releasetools: Fix the bug when deleting files.
Ying Wang [Fri, 4 Sep 2015 17:31:07 +0000 (17:31 +0000)]
Merge "Move part of logtags stuff back to base_rules.mk."
Tao Bao [Fri, 4 Sep 2015 17:05:55 +0000 (17:05 +0000)]
Merge "releasetools: Fix the bug when deleting files."
Yasuhiro Matsuda [Fri, 4 Sep 2015 07:23:49 +0000 (16:23 +0900)]
Move part of logtags stuff back to base_rules.mk.
Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.
BUG:
23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
Tao Bao [Fri, 4 Sep 2015 04:17:37 +0000 (21:17 -0700)]
releasetools: Fix the bug when deleting files.
For file-based OTAs, we used to remove unneeded files in ascending
order, which failed to delete non-empty directories. Reverse the order
to fix the issue.
For example, now we have the following in our generated script:
delete("/system/app/Calculator/arm/Calculator.odex",
"/system/app/Calculator/arm/",
"/system/app/Calculator/Calculator.apk",
"/system/app/Calculator/");
Bug:
22960996
Change-Id: I0d36d29b7862fb53bf55bf5685a990180f9c0b3b
Dan Willemsen [Fri, 4 Sep 2015 01:31:22 +0000 (01:31 +0000)]
am
4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS"
* commit '
4379e2b8bbaf2a02777f189c758e251015eb7f76':
Add LOCAL_MODULE_HOST_OS
Dan Willemsen [Fri, 4 Sep 2015 01:24:15 +0000 (01:24 +0000)]
Merge "Add LOCAL_MODULE_HOST_OS"
Dan Willemsen [Fri, 14 Aug 2015 19:59:06 +0000 (12:59 -0700)]
Add LOCAL_MODULE_HOST_OS
Instead of wrapping a host module definition in 'ifeq($(HOST_OS),...)'
in the Android.mk files, define which hosts are supported using
LOCAL_MODULE_HOST_OS.
A blank LOCAL_MODULE_HOST_OS means that linux and darwin are supported.
A non-empty LOCAL_MODULE_HOST_OS lists the supported HOST_OSs.
Change-Id: I1e342d1908cfa00aef2c39c145b4f5f81c373bc6
Tom Cherry [Thu, 3 Sep 2015 22:02:38 +0000 (22:02 +0000)]
am
62062c9d: Merge "move init.trace.rc to frameworks/native"
* commit '
62062c9d66e38ad404d93e963c1341fa4b7090fe':
move init.trace.rc to frameworks/native
Tom Cherry [Thu, 3 Sep 2015 21:52:45 +0000 (21:52 +0000)]
Merge "move init.trace.rc to frameworks/native"
Tom Cherry [Thu, 3 Sep 2015 21:12:48 +0000 (14:12 -0700)]
move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug
23186545
Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
Tao Bao [Thu, 3 Sep 2015 01:40:41 +0000 (01:40 +0000)]
am
c6c9c61d: Merge "releasetools: Fix the bug in symlink deletion."
* commit '
c6c9c61d05ffcc41239baaa1f3011b17e8518b65':
releasetools: Fix the bug in symlink deletion.
Tao Bao [Thu, 3 Sep 2015 01:32:08 +0000 (01:32 +0000)]
Merge "releasetools: Fix the bug in symlink deletion."
Tao Bao [Wed, 2 Sep 2015 17:28:08 +0000 (10:28 -0700)]
releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug:
23646151
Change-Id: Ie322abb6022b6fa812c6b36a3127872d9614fc3b
Ying Wang [Wed, 2 Sep 2015 21:18:38 +0000 (21:18 +0000)]
am
4e2f1903: Merge "Clean up Javac a little bit."
* commit '
4e2f190315759b4270ab414b9ff1e24a19521521':
Clean up Javac a little bit.
Ying Wang [Wed, 2 Sep 2015 20:48:50 +0000 (20:48 +0000)]
Merge "Clean up Javac a little bit."
Evgenii Stepanov [Wed, 2 Sep 2015 20:18:12 +0000 (20:18 +0000)]
am
617770c1: Merge "Add AddressSanitizer linker flags for x86."
* commit '
617770c133330fc06070e97ce39bbf065c749c97':
Add AddressSanitizer linker flags for x86.
Evgenii Stepanov [Wed, 2 Sep 2015 20:13:37 +0000 (20:13 +0000)]
Merge "Add AddressSanitizer linker flags for x86."
Ivan Krasin [Wed, 2 Sep 2015 18:56:40 +0000 (11:56 -0700)]
Add AddressSanitizer linker flags for x86.
This is the 1/4 change required to get AddressSanitizer
for Android x86 to work.
Change-Id: I848805af34fdd32a313c991504d6014f9b97ab88
Ying Wang [Wed, 2 Sep 2015 02:12:05 +0000 (19:12 -0700)]
Clean up Javac a little bit.
- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
of java_alternative_checked_module now.
Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
Shinichiro Hamaji [Wed, 2 Sep 2015 00:04:45 +0000 (00:04 +0000)]
am
e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets"
* commit '
e1b9123d51f20543fd13ebd611c9c2fe92ecaf9c':
Set --ninja_suffix based on make/mm/mmm targets
Shinichiro Hamaji [Tue, 1 Sep 2015 23:53:41 +0000 (23:53 +0000)]
Merge "Set --ninja_suffix based on make/mm/mmm targets"
Shinichiro Hamaji [Tue, 1 Sep 2015 05:24:18 +0000 (14:24 +0900)]
Set --ninja_suffix based on make/mm/mmm targets
This fixes two issues:
- Switching make target didn't work well when the latter
make target is not a subset of the first make target.
- Switching between m and mm/mmm forced build.ninja to be
regenerated.
Bug:
23685536
Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
Shinichiro Hamaji [Tue, 1 Sep 2015 16:37:44 +0000 (16:37 +0000)]
am
ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true"
* commit '
ec8f973147c3eacb048dd486c9534562f0328303':
Show error message when resource limit too low for USE_GOMA=true
Dan Willemsen [Tue, 1 Sep 2015 16:37:42 +0000 (16:37 +0000)]
am
d0ae4796: Merge "Blacklist libc++ from windows host builds"
* commit '
d0ae4796a10b9855a738c5f5c79e603cac30cb9f':
Blacklist libc++ from windows host builds
Richard Uhler [Tue, 1 Sep 2015 16:36:23 +0000 (16:36 +0000)]
am
e4c753f4: Merge "Add ahat to runtime_libart product."
* commit '
e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
Ying Wang [Tue, 1 Sep 2015 16:35:59 +0000 (16:35 +0000)]
am
8838c72e: Merge "Cleaned the outdated incrementaljavac."
* commit '
8838c72e8a339270fb3bea3d467200c6c0c28782':
Cleaned the outdated incrementaljavac.
Ying Wang [Tue, 1 Sep 2015 16:31:56 +0000 (09:31 -0700)]
resolved conflicts for merge of
a15ae216 to stage-aosp-master
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
Shinichiro Hamaji [Tue, 1 Sep 2015 02:26:15 +0000 (02:26 +0000)]
Merge "Show error message when resource limit too low for USE_GOMA=true"
Dan Willemsen [Tue, 1 Sep 2015 00:44:21 +0000 (00:44 +0000)]
Merge "Blacklist libc++ from windows host builds"
Richard Uhler [Mon, 31 Aug 2015 16:53:55 +0000 (16:53 +0000)]
Merge "Add ahat to runtime_libart product."
Ying Wang [Sat, 29 Aug 2015 18:09:20 +0000 (18:09 +0000)]
Merge "Cleaned the outdated incrementaljavac."
Ying Wang [Fri, 8 May 2015 20:27:25 +0000 (13:27 -0700)]
Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.
Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit
90598cb70c3a6e65223f02c4104e823024caf693)
Ying Wang [Sat, 29 Aug 2015 16:40:30 +0000 (16:40 +0000)]
Merge "Move Java stuff out of base_rules.mk"
Shinichiro Hamaji [Sat, 29 Aug 2015 02:58:47 +0000 (11:58 +0900)]
Show error message when resource limit too low for USE_GOMA=true
This should be particularly helpful for Mac users, because the
default limits of Mac are too low.
Change-Id: I03f0f76a0707b4ce5ef9cddf5df6e3857a215996
Ying Wang [Fri, 28 Aug 2015 18:47:03 +0000 (11:47 -0700)]
Move Java stuff out of base_rules.mk
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules, Java library dependency calculation,
Java resource processing and Java-related
target-specific and global variables setup to a new java_common.java,
which is shared by both target and host Java modules.
- Minor cleanup for the moved code.
Bug:
23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
Richard Uhler [Fri, 31 Jul 2015 16:39:26 +0000 (09:39 -0700)]
Add ahat to runtime_libart product.
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d