OSDN Git Service
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:31:59 +0000 (03:31 +0000)]
Merge "Use the same build.ninja for normal make targets"
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: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: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: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: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
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: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: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: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: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 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: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 20:48:50 +0000 (20:48 +0000)]
Merge "Clean up Javac a little bit."
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 [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 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
Elliott Hughes [Fri, 28 Aug 2015 19:47:36 +0000 (19:47 +0000)]
Merge "Remove AndroidConfig.h."
Tao Bao [Fri, 28 Aug 2015 18:33:25 +0000 (18:33 +0000)]
Merge "Use the basename of file_contexts from the info dict."
Tao Bao [Fri, 28 Aug 2015 17:52:03 +0000 (10:52 -0700)]
Use the basename of file_contexts from the info dict.
Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.
[1] commit
d3a803e6680e86f7b4960d51ab0b620728b793ca
Bug:
23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
Elliott Hughes [Fri, 28 Aug 2015 17:31:28 +0000 (10:31 -0700)]
Remove AndroidConfig.h.
This change leaves soong references.
Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
Dan Willemsen [Fri, 28 Aug 2015 03:39:34 +0000 (03:39 +0000)]
Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
Dan Willemsen [Wed, 19 Aug 2015 00:47:06 +0000 (17:47 -0700)]
Add support for LOCAL_SRC_FILES_(host)_(arch)
For boringssl, which has architecture specific host assembly files
Bug:
23566667
Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
Dan Willemsen [Fri, 28 Aug 2015 03:37:30 +0000 (03:37 +0000)]
Merge "Add _(darwin|linux|windows)"
Dan Willemsen [Fri, 14 Aug 2015 00:51:40 +0000 (17:51 -0700)]
Add _(darwin|linux|windows)
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.
Bug:
23566667
Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
Tao Bao [Thu, 27 Aug 2015 19:16:06 +0000 (19:16 +0000)]
Merge "rangelib.py: Fix the bug in monotonic check."
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
Tao Bao [Wed, 26 Aug 2015 23:26:54 +0000 (23:26 +0000)]
Merge "Add unit tests for rangelib.py."
Tao Bao [Wed, 26 Aug 2015 23:13:18 +0000 (16:13 -0700)]
Add unit tests for rangelib.py.
Separate the test cases in rangelib.py comments into a python unittest
file.
To invoke:
$ python -m unittest test_rangelib
Change-Id: I59e4ce0aaccc83bcbb42fee15775683dcd559d99
Tao Bao [Wed, 26 Aug 2015 19:39:31 +0000 (19:39 +0000)]
Merge "Split large files for BBOTA v3."
Tao Bao [Tue, 25 Aug 2015 22:10:10 +0000 (15:10 -0700)]
Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).
With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.
One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.
[1] commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae
Bug:
22430577
Change-Id: I5684fab0ac41c8d94fe18f52a34cef77e06f741c
Nick Kralevich [Tue, 25 Aug 2015 22:41:57 +0000 (22:41 +0000)]
Merge "Only allow toolbox exec where /system exec was already allowed."
Ying Wang [Tue, 25 Aug 2015 17:12:36 +0000 (17:12 +0000)]
Merge "Dist the otatools package."
Stephen Smalley [Tue, 25 Aug 2015 15:42:17 +0000 (11:42 -0400)]
Only allow toolbox exec where /system exec was already allowed.
When the toolbox domain was introduced, we allowed all domains to exec it
to avoid breakage. However, only domains that were previously allowed the
ability to exec /system files would have been able to do this prior to the
introduction of the toolbox domain. Remove the rule from domain.te and add
rules to all domains that are already allowed execute_no_trans to system_file.
Requires coordination with device-specific policy changes with the same Change-Id.
Change-Id: Ie46209f0412f9914857dc3d7c6b0917b7031aae5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
Tom Cherry [Mon, 24 Aug 2015 23:23:36 +0000 (23:23 +0000)]
Merge "remove TARGET_PROVIDES_INIT_RC"
Tom Cherry [Mon, 24 Aug 2015 20:55:02 +0000 (13:55 -0700)]
remove TARGET_PROVIDES_INIT_RC
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
Christopher Wiley [Fri, 21 Aug 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Change .dbus.xml extension to .dbus-xml"
Shinichiro Hamaji [Fri, 21 Aug 2015 03:24:27 +0000 (03:24 +0000)]
Merge "Use goma when USE_GOMA=true is set"
Elliott Hughes [Thu, 20 Aug 2015 23:56:07 +0000 (23:56 +0000)]
Merge "Fix Linux host checkbuilds."
Elliott Hughes [Thu, 20 Aug 2015 23:52:47 +0000 (16:52 -0700)]
Fix Linux host checkbuilds.
Turns out that thanks to
9d59f417767991246848c3e101cb27d2dfea5988 we actually
build *all* the host libraries both 32- and 64-bit. Rather than fix the
libraries (or fixing things so we don't build stuff we don't need) right now,
let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back.
Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd
Elliott Hughes [Thu, 20 Aug 2015 23:10:05 +0000 (23:10 +0000)]
Merge "Kill host Linux AndroidConfig.h."
Elliott Hughes [Thu, 20 Aug 2015 21:23:59 +0000 (21:23 +0000)]
Merge "Revert "Fix Windows SDK build.""
Elliott Hughes [Thu, 20 Aug 2015 21:22:19 +0000 (21:22 +0000)]
Revert "Fix Windows SDK build."
This reverts commit
b8dd176441f6ba9527d24a5065d8225437fe39d5.
This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.
Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
Elliott Hughes [Thu, 20 Aug 2015 21:21:01 +0000 (21:21 +0000)]
Merge "Stop defining WIN32."
Elliott Hughes [Thu, 20 Aug 2015 21:04:18 +0000 (14:04 -0700)]
Stop defining WIN32.
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
Ying Wang [Thu, 20 Aug 2015 20:47:53 +0000 (20:47 +0000)]
Merge "Support LOCAL_INIT_RC."
Ying Wang [Thu, 20 Aug 2015 19:02:10 +0000 (12:02 -0700)]
Support LOCAL_INIT_RC.
A module can install a companion init.rc file,
by specifying:
LOCAL_INIT_RC := <init.rc-file-path-replative-to-LOCAL_PATH>
You can also use the variant with _32 or _64 suffix.
Bug:
23186545
Change-Id: I00a96509f5707ae39361a0c5555fa59d46c90322
Elliott Hughes [Thu, 20 Aug 2015 17:16:40 +0000 (10:16 -0700)]
Kill host Linux AndroidConfig.h.
We only build 64-bit now anyway.
Change-Id: I4bc9487522d215234509510bee66e4f210d86765
Elliott Hughes [Thu, 20 Aug 2015 18:11:18 +0000 (18:11 +0000)]
Merge "Also -DWIN32 to keep llvm building."
Elliott Hughes [Thu, 20 Aug 2015 18:10:22 +0000 (11:10 -0700)]
Also -DWIN32 to keep llvm building.
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
Elliott Hughes [Thu, 20 Aug 2015 17:20:45 +0000 (17:20 +0000)]
Merge "Fix Windows SDK build."
Elliott Hughes [Thu, 20 Aug 2015 17:19:26 +0000 (10:19 -0700)]
Fix Windows SDK build.
I forgot that removing a file doesn't cause a rebuild in our lame build
system, so I hadn't actually tested my previous change.
Change-Id: Ida19d4a8fd40e37029031eac4b4ca5f0cc5c895b
Elliott Hughes [Thu, 20 Aug 2015 16:59:03 +0000 (16:59 +0000)]
Merge "Remove Windows AndroidConfig.h."
Elliott Hughes [Thu, 20 Aug 2015 00:45:17 +0000 (17:45 -0700)]
Remove Windows AndroidConfig.h.
The only things left that we're using are the Windows target version
and _FILE_OFFSET_BITS=64, and they can go in the combo .mk.
Also fix the unused Windows 64 .mk.
Change-Id: I5f2458d67c0a8201196a339573f861bbf18b7eb8
Christopher Wiley [Thu, 20 Aug 2015 16:08:17 +0000 (09:08 -0700)]
Change .dbus.xml extension to .dbus-xml
Work around gyp's inability to handle compound extensions by expecting
a similar looking simple extension for XML files definine DBus
interfaces. We'll need to rename these sources in the places we're
using them already.
Bug:
23380180
Change-Id: Ieb2050f3ef05456cd70de65c3e128d57a6a508f8
Shinichiro Hamaji [Mon, 17 Aug 2015 08:38:24 +0000 (17:38 +0900)]
Use goma when USE_GOMA=true is set
With USE_GOMA, the path to gomacc in $GOMA_DIR or $HOME/goma
will be appended to CC_WRAPPER and CXX_WRAPPER.
Note this works only with USE_NINJA. Unlike ninja, GNU make
cannot change the parallelism depending on targets. Specifying
-j500 to GNU make would mean you may run 500 local jobs in
parallel, but with -j32 goma will just slow down the build.
Change-Id: I0f571454fd2a5b525ee29b445f7ab8715927ca00
Shinichiro Hamaji [Thu, 20 Aug 2015 05:25:34 +0000 (05:25 +0000)]
Merge "Add two flags for the latest ckati"
Dan Albert [Thu, 20 Aug 2015 05:07:34 +0000 (05:07 +0000)]
Merge "Fix sanitizer choice for global vs module."
Dan Albert [Thu, 20 Aug 2015 03:13:33 +0000 (20:13 -0700)]
Fix sanitizer choice for global vs module.
The sanitizer chosen by the environment (either by SANITIZE_TARGET or
SANITIZE_HOST) should be chosen over the one specified by the module.
Bug: http://b/
23330588
Change-Id: I835b7d76e071fc0db2f859f98dfb9d7ff76af245
Elliott Hughes [Wed, 19 Aug 2015 22:09:32 +0000 (22:09 +0000)]
Merge "Stop defining HAVE_MS_C_RUNTIME."
Christopher Wiley [Wed, 19 Aug 2015 21:39:28 +0000 (21:39 +0000)]
Merge "Fix DBus proxies to use all definitions"
Elliott Hughes [Wed, 19 Aug 2015 21:22:59 +0000 (14:22 -0700)]
Stop defining HAVE_MS_C_RUNTIME.
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
Christopher Wiley [Wed, 19 Aug 2015 20:48:53 +0000 (13:48 -0700)]
Fix DBus proxies to use all definitions
Bug:
22608897
Change-Id: Id17cf4b896c1c62be874599c7f346f3045e36819
Christopher Wiley [Wed, 19 Aug 2015 18:30:20 +0000 (18:30 +0000)]
Merge "Generate DBus proxies and adaptors separately"
Christopher Wiley [Fri, 14 Aug 2015 21:55:32 +0000 (14:55 -0700)]
Generate DBus proxies and adaptors separately
Enable daemons exposing an interface over DBus to easily
build client libraries. Now daemons can write rules like:
include $(CLEAR_VARS)
LOCAL_MODULE := libdbus-binding-example-client
LOCAL_DBUS_PROXY_PREFIX := dbus-example-example
LOCAL_SRC_FILES := \
dbus_bindings/org.chromium.Example.Manager.dbus.xml \
dbus_bindings/dbus-service-config.json
include $(BUILD_SHARED_LIBRARY)
to expose a client library.
While here, add support for generating independent adaptor header
files on a per interface basis.
Bug:
22608897
Change-Id: I011f9afc234811c31e445898321c2731c482fa77
Tao Bao [Wed, 19 Aug 2015 02:34:27 +0000 (02:34 +0000)]
Merge "build: Don't call make_recovery_patch if there's no recovery."
Dan Willemsen [Fri, 14 Aug 2015 00:41:56 +0000 (17:41 -0700)]
Blacklist libc++ from windows host builds
It's not ready, and instead of each Android.mk doing this, do it in the
core build.
Change-Id: Ie80b17ffcde64e72c98d310ca986d4cf775c099e
Tao Bao [Wed, 19 Aug 2015 01:03:56 +0000 (18:03 -0700)]
build: Don't call make_recovery_patch if there's no recovery.
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
Chih-hung Hsieh [Tue, 18 Aug 2015 22:11:03 +0000 (22:11 +0000)]
Merge "Remove special x86 flag that disables tail call optimization."
Ying Wang [Tue, 18 Aug 2015 21:35:42 +0000 (21:35 +0000)]
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."