Elliott Hughes
ded991b47d
Merge "Revert "Fix Windows SDK build.""
2015-08-20 21:23:59 +00:00
Elliott Hughes
73042ea0c7
Revert "Fix Windows SDK build."
...
This reverts commit b8dd176441
.
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
2015-08-20 21:22:19 +00:00
Elliott Hughes
a6065996cd
Merge "Stop defining WIN32."
2015-08-20 21:21:01 +00:00
Elliott Hughes
f0c04c7b2e
Stop defining WIN32.
...
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
2015-08-20 14:04:18 -07:00
Ying Wang
4270d91bbe
am 8a3241e3
: am 11a38e7a
: Merge "Support LOCAL_INIT_RC."
...
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
Support LOCAL_INIT_RC.
2015-08-20 21:00:07 +00:00
Ying Wang
8a3241e39a
am 11a38e7a
: Merge "Support LOCAL_INIT_RC."
...
* commit '11a38e7a9164bc3268344ce716c4bd12b08cb05c':
Support LOCAL_INIT_RC.
2015-08-20 20:53:32 +00:00
Ying Wang
11a38e7a91
Merge "Support LOCAL_INIT_RC."
2015-08-20 20:47:53 +00:00
Elliott Hughes
59b3bd27a0
am 896d0ee2
: am 999fd4ea
: Merge "Also -DWIN32 to keep llvm building."
...
* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
Also -DWIN32 to keep llvm building.
2015-08-20 19:32:39 +00:00
Elliott Hughes
29e8a32972
am 9f9d2aed
: am 79b199b8
: Merge "Fix Windows SDK build."
...
* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
Fix Windows SDK build.
2015-08-20 19:32:34 +00:00
Elliott Hughes
a65473b0e7
am 896b9c60
: am 57069e59
: Merge "Remove Windows AndroidConfig.h."
...
* commit '896b9c603938220ea40f75a07aef8ec1a0664f37':
Remove Windows AndroidConfig.h.
2015-08-20 19:32:30 +00:00
Shinichiro Hamaji
5047933993
am 9e7efdf3
: am e7d6f04d
: Merge "Add two flags for the latest ckati"
...
* commit '9e7efdf3e659c2de002b96ec27589f12c1f01512':
Add two flags for the latest ckati
2015-08-20 19:31:56 +00:00
Dan Albert
a8803f0b3c
am 54e0b7de
: am 6b966aff
: Merge "Fix sanitizer choice for global vs module."
...
* commit '54e0b7de2ba60b8c769b985be397317790dcfd75':
Fix sanitizer choice for global vs module.
2015-08-20 19:31:54 +00:00
Ying Wang
9fe15ac757
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
2015-08-20 12:15:15 -07:00
Elliott Hughes
896d0ee2cf
am 999fd4ea
: Merge "Also -DWIN32 to keep llvm building."
...
* commit '999fd4ea850b494f38ac23195ad5c2ee0b9486a2':
Also -DWIN32 to keep llvm building.
2015-08-20 18:18:50 +00:00
Elliott Hughes
e31dfe965f
Kill host Linux AndroidConfig.h.
...
We only build 64-bit now anyway.
Change-Id: I4bc9487522d215234509510bee66e4f210d86765
2015-08-20 11:14:23 -07:00
Elliott Hughes
0823ad3300
Also -DWIN32 to keep llvm building.
...
Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310
2015-08-20 11:10:22 -07:00
Elliott Hughes
9f9d2aedf4
am 79b199b8
: Merge "Fix Windows SDK build."
...
* commit '79b199b80e98ff7d0340de8c55f0da6d085e9ef8':
Fix Windows SDK build.
2015-08-20 17:26:50 +00:00
Elliott Hughes
b8dd176441
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
2015-08-20 10:19:26 -07:00
Elliott Hughes
896b9c6039
am 57069e59
: Merge "Remove Windows AndroidConfig.h."
...
* commit '57069e5974c3224550c3cf3a12dbe6ffac4b0c79':
Remove Windows AndroidConfig.h.
2015-08-20 17:06:48 +00:00
Elliott Hughes
57069e5974
Merge "Remove Windows AndroidConfig.h."
2015-08-20 16:59:03 +00:00
Elliott Hughes
f8241b41d5
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
2015-08-20 09:56:52 -07:00
Christopher Wiley
9b17dea308
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
2015-08-20 09:36:08 -07:00
Shinichiro Hamaji
ee482fd521
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
2015-08-20 14:33:44 +09:00
Shinichiro Hamaji
9e7efdf3e6
am e7d6f04d
: Merge "Add two flags for the latest ckati"
...
* commit 'e7d6f04d32c26e1355a1a01008941477c1432611':
Add two flags for the latest ckati
2015-08-20 05:31:30 +00:00
Shinichiro Hamaji
e7d6f04d32
Merge "Add two flags for the latest ckati"
2015-08-20 05:25:34 +00:00
Dan Albert
54e0b7de2b
am 6b966aff
: Merge "Fix sanitizer choice for global vs module."
...
* commit '6b966aff43fc4d80b8f35ef2a333107f68ac2be0':
Fix sanitizer choice for global vs module.
2015-08-20 05:13:56 +00:00
Dan Albert
4c40141a91
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
2015-08-19 20:24:23 -07:00
Elliott Hughes
33a1439796
am 088849e2
: am b3c585d7
: Merge "Stop defining HAVE_MS_C_RUNTIME."
...
* commit '088849e24da28e398179cd915f142ca4224e6888':
Stop defining HAVE_MS_C_RUNTIME.
2015-08-19 22:31:13 +00:00
Christopher Wiley
5bc62fdc65
am 7db39448
: am 9e3b4ed4
: Merge "Fix DBus proxies to use all definitions"
...
* commit '7db39448409ef9797089774ca8e196142662b0f2':
Fix DBus proxies to use all definitions
2015-08-19 22:31:10 +00:00
Christopher Wiley
9c49f0affa
am 688b4a3d
: am 4d2b79f9
: Merge "Generate DBus proxies and adaptors separately"
...
* commit '688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
Generate DBus proxies and adaptors separately
2015-08-19 22:31:03 +00:00
Elliott Hughes
088849e24d
am b3c585d7
: Merge "Stop defining HAVE_MS_C_RUNTIME."
...
* commit 'b3c585d745918bebb6e4ea72ad60875adf53337e':
Stop defining HAVE_MS_C_RUNTIME.
2015-08-19 22:18:33 +00:00
Elliott Hughes
b3c585d745
Merge "Stop defining HAVE_MS_C_RUNTIME."
2015-08-19 22:09:32 +00:00
Christopher Wiley
7db3944840
am 9e3b4ed4
: Merge "Fix DBus proxies to use all definitions"
...
* commit '9e3b4ed4991eb19e60346858bfdbb494d9324252':
Fix DBus proxies to use all definitions
2015-08-19 21:47:27 +00:00
Elliott Hughes
19fa8413ed
Stop defining HAVE_MS_C_RUNTIME.
...
Change-Id: Ie491547552ba64d60d669b74115da96a0fcced18
2015-08-19 14:22:59 -07:00
Christopher Wiley
974b82259a
Fix DBus proxies to use all definitions
...
Bug: 22608897
Change-Id: Id17cf4b896c1c62be874599c7f346f3045e36819
2015-08-19 13:48:53 -07:00
Christopher Wiley
688b4a3db7
am 4d2b79f9
: Merge "Generate DBus proxies and adaptors separately"
...
* commit '4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
Generate DBus proxies and adaptors separately
2015-08-19 18:37:48 +00:00
Christopher Wiley
4d2b79f99e
Merge "Generate DBus proxies and adaptors separately"
2015-08-19 18:30:20 +00:00
Christopher Wiley
529f176ee1
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
2015-08-19 11:14:16 -07:00
Tao Bao
42a2b83c53
am d88eaf02
: am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:46:41 +00:00
Tao Bao
d88eaf0255
am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit '123a7d380ee29941639a1fce10ba2051d37f860b':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:39:21 +00:00
Dan Willemsen
1ca3b70f84
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
2015-08-18 19:08:45 -07:00
Tao Bao
cbc6dc29d6
build: Don't call make_recovery_patch if there's no recovery.
...
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
2015-08-18 18:28:47 -07:00
Chih-hung Hsieh
2cc00c305c
am 3eccd047
: am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '3eccd04784d4a92e224bf0e6917f9a3b0353da1d':
Remove special x86 flag that disables tail call optimization.
2015-08-18 22:22:23 +00:00
Chih-hung Hsieh
3eccd04784
am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '59c858fc94d4cf45a260da81176372ca2a4b77ef':
Remove special x86 flag that disables tail call optimization.
2015-08-18 22:17:31 +00:00
Chih-hung Hsieh
59c858fc94
Merge "Remove special x86 flag that disables tail call optimization."
2015-08-18 22:11:03 +00:00
Ying Wang
71327b90d8
am 42fa1948
: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
...
* commit '42fa19482abbcebcb2ab563084b7ac1969553fe9':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
2015-08-18 21:41:05 +00:00
Ying Wang
f526c169ef
am c3dcb6c0
: Merge "Consolidate the nanopb-c and regular protobuf build rules."
...
* commit 'c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
Consolidate the nanopb-c and regular protobuf build rules.
2015-08-18 21:41:03 +00:00
Ying Wang
42fa19482a
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
2015-08-18 21:35:42 +00:00
Ying Wang
c3dcb6c06b
Merge "Consolidate the nanopb-c and regular protobuf build rules."
2015-08-18 21:35:37 +00:00
Ying Wang
f050c2f1c7
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
...
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-08-18 14:32:07 -07:00