StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,588 Commits 1 Branch 0 Tags
a7f68ee9eaa3dcaf4e17bbf6eb4dae68df2cbdda
Commit Graph

8323 Commits

Author SHA1 Message Date
Elliott Hughes
8f94a2699d am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build." 
* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
  Fix Windows SDK build.
 2015-08-20 17:35:21 +00: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
1e40ede21c am 896b9c60: am 57069e59: Merge "Remove Windows AndroidConfig.h." 
* commit '896b9c603938220ea40f75a07aef8ec1a0664f37':
  Remove Windows AndroidConfig.h.
 2015-08-20 17:16:01 +00: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
5d88dbf28e am 9e7efdf3: am e7d6f04d: Merge "Add two flags for the latest ckati" 
* commit '9e7efdf3e659c2de002b96ec27589f12c1f01512':
  Add two flags for the latest ckati
 2015-08-20 05:36:21 +00: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
20de32b9b7 am 54e0b7de: am 6b966aff: Merge "Fix sanitizer choice for global vs module." 
* commit '54e0b7de2ba60b8c769b985be397317790dcfd75':
  Fix sanitizer choice for global vs module.
 2015-08-20 05:20:08 +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
0064da9014 am 088849e2: am b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME." 
* commit '088849e24da28e398179cd915f142ca4224e6888':
  Stop defining HAVE_MS_C_RUNTIME.
 2015-08-19 22:29:33 +00:00
Christopher Wiley
94379e0a1c 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:20:33 +00:00
Christopher Wiley
3b27c3743e am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately" 
* commit '688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
  Generate DBus proxies and adaptors separately
 2015-08-19 22:20:23 +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
04ae3520a2 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:47:48 +00: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
35473f3d12 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
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
Ying Wang
b28ed234aa Consolidate the nanopb-c and regular protobuf build rules. 
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
 2015-08-18 14:27:45 -07:00
Dan Willemsen
6d65635ef7 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support" 
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
 2015-08-18 04:43:06 +00:00
Dan Willemsen
1b14846717 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support" 
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
 2015-08-18 04:43:04 +00:00
Dan Willemsen
48d95e7525 am 05d97fe7: Merge "Remove legacy windows platform build support" 
* commit '05d97fe723ea376edb5fe6b12535485311a32418':
  Remove legacy windows platform build support
 2015-08-18 04:37:09 +00:00
Dan Willemsen
05d97fe723 Merge "Remove legacy windows platform build support" 2015-08-18 04:31:07 +00:00
Dan Willemsen
9cf990beec resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp 
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
 2015-08-17 20:50:48 -07:00
Dan Willemsen
014719fcfc resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp 
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
 2015-08-17 20:44:29 -07:00