tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24629 commits 1 branch 0 tags 119 MiB
Commit graph

7918 commits

Author SHA1 Message Date
Ying Wang
9bf627422c resolved conflicts for merge of a15ae216 to stage-aosp-master 
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
 2015-09-01 09:31:56 -07:00
Shinichiro Hamaji
ec8f973147 Merge "Show error message when resource limit too low for USE_GOMA=true" 2015-09-01 02:26:15 +00:00
Dan Willemsen
d0ae4796a1 Merge "Blacklist libc++ from windows host builds" 2015-09-01 00:44:21 +00:00
Ying Wang
3351178fb8 Cleaned the outdated incrementaljavac. 
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit 90598cb70c)
 2015-08-29 11:08:02 -07:00
Shinichiro Hamaji
b601d4b0e4 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
 2015-08-29 12:01:51 +09:00
Ying Wang
956dcccf76 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
 2015-08-28 17:17:19 -07:00
Elliott Hughes
f04f391b5f am 4548e7f4: Merge "Remove AndroidConfig.h." 
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
  Remove AndroidConfig.h.
 2015-08-28 19:59:18 +00:00
Elliott Hughes
43146118aa Remove AndroidConfig.h. 
This change leaves soong references.

Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
 2015-08-28 10:31:28 -07:00
Dan Willemsen
d174629951 am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 
* commit '57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
 2015-08-28 03:49:02 +00:00
Dan Willemsen
399c59f3aa am d5deac8d: Merge "Add _(darwin|linux|windows)" 
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
  Add _(darwin|linux|windows)
 2015-08-28 03:49:01 +00:00
Dan Willemsen
85ac8d2a00 Add support for LOCAL_SRC_FILES_(host)_(arch) 
For boringssl, which has architecture specific host assembly files

Bug: 23566667

Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
 2015-08-28 03:38:43 +00:00
Dan Willemsen
7a5498568f 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
 2015-08-28 03:36:22 +00:00
Bart Sears
4535d7cb34 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev 
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
 2015-08-26 03:47:52 +00:00
Ying Wang
c9343c0bc3 am cf129c53: am a7eaf450: Merge "Dist the otatools package." 
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
  Dist the otatools package.
 2015-08-25 17:27:26 +00:00
Ying Wang
cf129c5382 am a7eaf450: Merge "Dist the otatools package." 
* commit 'a7eaf450781483791b02241fd6ab62767d4d6f99':
  Dist the otatools package.
 2015-08-25 17:21:57 +00:00
Bart Sears
0bb3145b56 Set the Security Patch level for MNC 
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.

Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
 2015-08-24 23:22:20 -07:00
Ying Wang
267e957373 Dist the otatools package. 
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
 2015-08-24 17:13:53 -07:00
Tom Cherry
00c9b1b323 am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:35:17 +00:00
Tom Cherry
2899727fd7 am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit 'bcbd4eb9fb9c82f35ca46cc9b976a59b6c1645d4':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:28:34 +00:00
Tom Cherry
2df35aea43 remove TARGET_PROVIDES_INIT_RC 
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
 2015-08-24 13:55:02 -07:00
Christopher Wiley
3f7c5424db am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 22:24:31 +00:00
Christopher Wiley
2b2c9dff35 am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '4e719eafc4d183dd923518cea6292f37ee1e26c6':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 20:51:11 +00:00
Christopher Wiley
4e719eafc4 Merge "Change .dbus.xml extension to .dbus-xml" 2015-08-21 20:46:21 +00:00
Shinichiro Hamaji
8a0607f069 am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:36:12 +00:00
Shinichiro Hamaji
b3cd0a5663 am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit '39c7d243395ad3f2015571aaf902dc4d4686e981':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:29:49 +00:00
Shinichiro Hamaji
39c7d24339 Merge "Use goma when USE_GOMA=true is set" 2015-08-21 03:24:27 +00:00
Elliott Hughes
dc289ce17c am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.
 2015-08-21 00:11:53 +00:00
Elliott Hughes
344c33949b am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '6f5341259c6b6684acb4e91d9220593c231abecd':
  Fix Linux host checkbuilds.
 2015-08-21 00:05:12 +00:00
Elliott Hughes
6f5341259c Merge "Fix Linux host checkbuilds." 2015-08-20 23:56:07 +00:00
Elliott Hughes
ac9eea9463 Fix Linux host checkbuilds. 
Turns out that thanks to 9d59f41776 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
 2015-08-20 16:52:47 -07:00
Elliott Hughes
158800c9ed am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:20:21 +00:00
Elliott Hughes
30a18bca62 am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit 'a3fa59b12b7346b3d0fbb8c60f890e50c7f51f18':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:14:41 +00:00
Elliott Hughes
a3fa59b12b Merge "Kill host Linux AndroidConfig.h." 2015-08-20 23:10:05 +00:00
Elliott Hughes
b4ec57c016 am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
  Revert "Fix Windows SDK build."
 2015-08-20 21:54:58 +00:00
Elliott Hughes
7f45f953ad am 0049aecf: am a6065996: Merge "Stop defining WIN32." 
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
  Stop defining WIN32.
 2015-08-20 21:54:57 +00:00
Elliott Hughes
00da9cede0 am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit 'ded991b47d0235bd505b5d95e438118d0b7f1041':
  Revert "Fix Windows SDK build."
 2015-08-20 21:43:17 +00:00
Elliott Hughes
0049aecf17 am a6065996: Merge "Stop defining WIN32." 
* commit 'a6065996cd280acf11f199c1f90e1b8886635207':
  Stop defining WIN32.
 2015-08-20 21:43:16 +00:00
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
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
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
05fae7e0be am e6510750: Merge "Use repeatable timestamps" 
* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
  Use repeatable timestamps
 2015-08-18 03:35:44 +00:00
Dan Willemsen
e65107508a Merge "Use repeatable timestamps" 2015-08-18 03:30:11 +00:00
Ying Wang
f4ff2b119c am 808f0541: am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER" 
* commit '808f0541bba725c4fdc9d2b425a305eeeb024e39':
  Set up dependency on ADDRESS_SANITIZER_LINKER
 2015-08-18 00:18:48 +00:00
Ying Wang
808f0541bb am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER" 
* commit '77128117d8b7811b86ba89e963f8a96cc6c55a6b':
  Set up dependency on ADDRESS_SANITIZER_LINKER
 2015-08-18 00:11:11 +00:00
Ying Wang
a05e222368 Set up dependency on ADDRESS_SANITIZER_LINKER 
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.

Bug: 22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
 2015-08-17 17:06:14 -07:00
Dan Albert
c0ad316183 am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST." 
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
  Add BUILD(_HOST)?_FUZZ_TEST.
 2015-08-17 22:46:38 +00:00
Dan Albert
9496ef903f am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST." 
* commit 'c0018b04e984180122ab615d8dbea09a3230ef7f':
  Add BUILD(_HOST)?_FUZZ_TEST.
 2015-08-17 22:39:25 +00:00
Dan Albert
36b6f0472f Add BUILD(_HOST)?_FUZZ_TEST. 
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.

Bug: http://b/22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
 2015-08-17 14:39:27 -07:00
Dan Albert
401faa3513 am 8d61be6c: am f9b75b1b: Merge "Don\'t filter on a non-existent variable." 
* commit '8d61be6c781277ae3f5423c805092220a961b102':
  Don't filter on a non-existent variable.
 2015-08-17 20:24:05 +00:00
Dan Albert
8d61be6c78 am f9b75b1b: Merge "Don\'t filter on a non-existent variable." 
* commit 'f9b75b1b24d985c873e548d4fd7945a6cdd99323':
  Don't filter on a non-existent variable.
 2015-08-17 20:19:30 +00:00
Dan Willemsen
145ae32069 Remove legacy windows platform build support 
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.

Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
 2015-08-17 12:35:04 -07:00
Dan Albert
1b2187d871 Don't filter on a non-existent variable. 
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.

Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
 2015-08-17 10:36:09 -07:00
Shinichiro Hamaji
5b6b6bb974 Add two flags for the latest ckati 
* --regen

Re-generate build.ninja only when necessary. If either

1. .mk file is updated,
2. environment variable is updated,
3. $(wildcard) result is changed, or
4. $(shell) result is changed,

ckati will regenerate ninja file. This check takes only ~1
second, so incremental build will become much faster even
without "fastincremental" target.

* --ignore_dirty=out/%:

Some .mk files in out/ (e.g.,
out/target/product/generic/previous_build_config.mk)
are updated while ckati is running. With this flag, ckati
does not regenerate build.ninja when they look modified.
This should be OK for ninja based build, as ninja handles
command line changes nicely.

Change-Id: I7a2fca0e327d999599d6b16f06358e8a5e657565
 2015-08-17 20:20:20 +09:00
Stephen Hines
7b6af490e9 am 5d17a7e2: am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
  Add -mfpu=neon-vfpv4 if cpu is krait
 2015-08-15 02:18:58 +00:00
Yang Ni
9d1eaaea61 am dcfb0c80: am 36600a6b: Merge "Include target api version in build system for rscpp." 
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
  Include target api version in build system for rscpp.
 2015-08-15 02:18:57 +00:00
Stephen Hines
5d17a7e2ad am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
  Add -mfpu=neon-vfpv4 if cpu is krait
 2015-08-15 02:12:46 +00:00
Stephen Hines
2e08cb6e1b Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 2015-08-15 02:04:55 +00:00
Yang Ni
dcfb0c8018 am 36600a6b: Merge "Include target api version in build system for rscpp." 
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
  Include target api version in build system for rscpp.
 2015-08-14 18:46:18 +00:00
Yang Ni
36600a6bf9 Merge "Include target api version in build system for rscpp." 2015-08-14 18:39:47 +00:00
Dan Albert
7911f1b1aa am 5e9f4912: am 578acca4: Merge "Link librt on the host when using sanitizers." 
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
  Link librt on the host when using sanitizers.
 2015-08-14 01:10:46 +00:00
Dan Albert
5e9f491218 am 578acca4: Merge "Link librt on the host when using sanitizers." 
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
  Link librt on the host when using sanitizers.
 2015-08-14 01:05:03 +00:00
Dan Albert
578acca4e2 Merge "Link librt on the host when using sanitizers." 2015-08-14 00:59:52 +00:00
Dan Albert
2922411446 Link librt on the host when using sanitizers. 
The sanitizers now use shared memory.

Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
 2015-08-13 17:25:10 -07:00
Noah Presler
4796a8c524 Include target api version in build system for rscpp. 
b/23161320

Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
 2015-08-13 17:07:56 -07:00
Chris Banes
0fd694f360 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev 
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
 2015-08-13 17:36:54 +00:00
Dan Albert
dc0e7244a6 am 2c00d629: am 727b462a: Merge "Never allow -w." 
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
  Never allow -w.
 2015-08-13 17:02:13 +00:00
Dan Albert
2c00d62940 am 727b462a: Merge "Never allow -w." 
* commit '727b462a92635665ce636c63123078a970654480':
  Never allow -w.
 2015-08-13 16:52:55 +00:00
Dan Albert
727b462a92 Merge "Never allow -w." 2015-08-13 16:48:18 +00:00
Neil Fuller
53d1632681 am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:51:04 +00:00
Neil Fuller
5f19844067 am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes" 
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes
 2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7 Merge "Include the okhttp.jar when compiling against internal classes" 2015-08-13 10:40:39 +00:00
Chris Banes
b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs 
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
 2015-08-13 10:42:02 +01:00
Dianne Hackborn
42ebdfc574 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 00:53:51 +00:00
Dianne Hackborn
25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Nick Kralevich
420662b9cd am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-13 00:00:36 +00:00
Nick Kralevich
c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:53:50 +00:00
Nick Kralevich
5f79bcdd07 Merge changes from topic 'file_contexts.bin' 
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:46:28 +00:00
Dianne Hackborn
e593e5c42a Fix issie #23116383: Include security patch level in Settings 
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
 2015-08-12 16:29:08 -07:00
Dan Albert
df3fd1d128 Never allow -w. 
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.

Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
 2015-08-12 14:54:16 -07:00
Neil Fuller
f39a25bc28 Include the okhttp.jar when compiling against internal classes 
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.

okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.

The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.

This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.

Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
 2015-08-12 09:30:58 +01:00
Dan Willemsen
ccc933e97b Use repeatable timestamps 
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
 2015-08-12 00:02:20 -07:00
Dan Willemsen
8478f7abbd resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp 
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
 2015-08-11 18:31:59 -07:00
Dan Willemsen
33f46daa22 resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp 
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
 2015-08-11 18:21:43 -07:00
Dan Willemsen
b184ec2a82 am 608aa91d: Merge "Revert "Use repeatable timestamps"" 
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"
 2015-08-12 01:07:44 +00:00
Dan Willemsen
608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00
Dan Willemsen
92026f2d36 Revert "Use repeatable timestamps" 
OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
 2015-08-12 01:00:19 +00:00
Dan Willemsen
c576c08fd5 am 671b8ff5: Merge "Use repeatable timestamps" 
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
  Use repeatable timestamps
 2015-08-12 00:55:21 +00:00
Dan Willemsen
671b8ff545 Merge "Use repeatable timestamps" 2015-08-12 00:49:26 +00:00
Dan Willemsen
13ba6e00f4 Use repeatable timestamps 
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
 2015-08-11 17:08:03 -07:00
Ying Wang
2bf0ba2dcf am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
  Don't build otapackage on Mac.
 2015-08-11 23:23:39 +00:00
Ying Wang
23cb26c7bf am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
  Don't build otapackage on Mac.
 2015-08-11 23:14:52 +00:00
Ying Wang
20febe3d83 Merge "Don't build otapackage on Mac." 2015-08-11 22:49:25 +00:00
Ying Wang
09c4b68dfd Don't build otapackage on Mac. 
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.

Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
 2015-08-11 11:45:54 -07:00
Ian Pedowitz
d18917b781 am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:42:15 +00:00
Ian Pedowitz
a18c5028d7 Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
 2015-08-11 10:02:15 -07:00
Ian Pedowitz
a1c92301f4 am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:17:49 +00:00
Ian Pedowitz
38ffb0cf89 Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
 2015-08-11 07:50:04 -07:00
Ying Wang
49e20876b6 am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
 2015-08-10 22:28:30 +00:00
Ying Wang
a16556450c am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
  Allow custom recovery resource dirs.
 2015-08-10 22:23:10 +00:00
Ying Wang
edf7bf8d83 Merge "Allow custom recovery resource dirs." 2015-08-10 22:15:23 +00:00
Dan Albert
92d6efc595 am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:53:59 +00:00
Dan Albert
96f480c93a am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:48:48 +00:00
Dan Albert
c7d307d873 Bump the default C++ standard up to C++14. 
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.

Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
 2015-08-10 13:37:42 -07:00
Ying Wang
9a17568624 Allow custom recovery resource dirs. 
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.

Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
 2015-08-10 11:33:10 -07:00
Dan Willemsen
544fabcef0 am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0" 
* commit 'b8331622962be9d044eedce0aa1dff33ca1c5b16':
  build: Load makefiles in the same order with Make 4.0
 2015-08-07 20:20:56 +00:00
Dan Willemsen
b833162296 am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0" 
* commit '46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8':
  build: Load makefiles in the same order with Make 4.0
 2015-08-07 00:54:47 +00:00
Dan Willemsen
46ed451d12 Merge "build: Load makefiles in the same order with Make 4.0" 2015-08-07 00:47:51 +00:00
Yusuf Ozuysal
d513d14c8f am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev 
* commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
  Add support-customtabs to the doc build.
 2015-08-07 00:21:19 +00:00
Yusuf Ozuysal
736463f86c Merge "Add support-customtabs to the doc build." into mnc-dev 2015-08-07 00:10:39 +00:00
Dan Willemsen
ec224d5072 build: Load makefiles in the same order with Make 4.0 
Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.

This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.

Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
 2015-08-06 15:21:30 -07:00
Gilad Arnold
09905505f7 am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path." 
* commit '5070204e117d5a20f06fa337c652e36884f29d86':
  Remove LOCAL_MODULE from generated DBus header path.
 2015-08-06 22:10:29 +00:00
Gilad Arnold
5070204e11 am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path." 
* commit '7b49da7e9a97f7064e275251957ed78dc5e38360':
  Remove LOCAL_MODULE from generated DBus header path.
 2015-08-06 22:02:56 +00:00
Gilad Arnold
7b49da7e9a Merge "Remove LOCAL_MODULE from generated DBus header path." 2015-08-06 21:55:47 +00:00
Dan Albert
a1df0e6717 am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries." 
* commit '100422b2311a96fbbdb1ba62a9945c2637c9e861':
  Dedup system shared libraries.
 2015-08-06 21:40:18 +00:00
Dan Albert
6d5c952a7e am 849bf820: am 735cd90d: Merge "Disable transitive symbol resolving for mips64." 
* commit '849bf82079ea33b84c7c01fbc2e52205843720ed':
  Disable transitive symbol resolving for mips64.
 2015-08-06 21:40:17 +00:00
Dan Albert
100422b231 am 2e4b90e5: Merge "Dedup system shared libraries." 
* commit '2e4b90e5f152a964011bb621ee6112bee778d436':
  Dedup system shared libraries.
 2015-08-06 21:34:24 +00:00
Dan Albert
849bf82079 am 735cd90d: Merge "Disable transitive symbol resolving for mips64." 
* commit '735cd90d1762d10793bb52b0e0cf31f519e7af2b':
  Disable transitive symbol resolving for mips64.
 2015-08-06 21:34:19 +00:00
Dan Albert
2e4b90e5f1 Merge "Dedup system shared libraries." 2015-08-06 21:25:45 +00:00
Dan Albert
735cd90d17 Merge "Disable transitive symbol resolving for mips64." 2015-08-06 21:25:38 +00:00
Dan Albert
7ba582aec3 Dedup system shared libraries. 
These shouldn't differ by target. Right now only mips64 does, and
that's a bug.

Change-Id: Ic941ede85ba1bc07d3316a55639ba71a6afc9630
 2015-08-06 14:18:55 -07:00
Dan Albert
46ed1e8590 Disable transitive symbol resolving for mips64. 
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.

This matches the change made for the the aarch64 toolchain:
https://android-review.googlesource.com/#/c/120654

Change-Id: Id5b2a63301cb1cdcdd84b4bcd9fbec8cf6ec0b3c
 2015-08-06 14:18:55 -07:00
Gilad Arnold
54e92d0061 Remove LOCAL_MODULE from generated DBus header path. 
Its presence requires #include directives to contain the build target
name, which is problematic because these directives can live in headers
that are shared by multiple build targets. Furthermore, having
LOCAL_MODULE in the generated header path is redundant because the
target directory is already private to the current build target (e.g.
.../<target_name>_intermediates/...).

Bug: 22608897
Change-Id: I059f71a1231e80f89c99441794a4491f2685036f
 2015-08-06 12:50:23 -07:00
Tao Bao
91fdd1a321 resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp 
Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
 2015-08-06 10:57:57 -07:00
Ying Wang
4a368585a5 am a101f558: am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'a101f55893ecaa59666faa653a926ea49d57212a':
  Build static ckati on Linux.
 2015-08-06 17:55:15 +00:00
Tao Bao
610520ad20 am 40467cbf: Merge "build: Support packaging for system_root_image." 
* commit '40467cbfbbc2a59d9b80f5c5ee97bd1a64bc2858':
  build: Support packaging for system_root_image.
 2015-08-06 17:49:49 +00:00
Ying Wang
a101f55893 am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'ecbc5b401a55ab4e9e0e9cc9bf720044c4d4a829':
  Build static ckati on Linux.
 2015-08-06 17:49:48 +00:00
Tao Bao
62bd479fdf build: Support packaging for system_root_image. 
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464
 2015-08-05 16:39:39 -07:00
Christopher Wiley
a3dbe51f42 resolved conflicts for merge of 7d1be400 to mnc-dev-plus-aosp 
Change-Id: Ifc2b669bc573f059f35085d11693ea3d2cac11ec
 2015-08-05 10:18:16 -07:00
Ying Wang
ecbc5b401a Merge "Build static ckati on Linux." 2015-08-05 16:43:59 +00:00
Christopher Wiley
7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces" 
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
 2015-08-05 15:46:44 +00:00
Christopher Wiley
5923fcd021 Merge "Add build rules to generate native DBus interfaces" 2015-08-05 15:40:00 +00:00
Ying Wang
6eed5fc703 am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master 
* commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1':
  Ignore .*.java files when collecting .java files.
 2015-08-04 20:44:58 +00:00
Ying Wang
bd555f1523 resolved conflicts for merge of d86f39ca to stage-aosp-master 
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
 2015-08-04 13:36:07 -07:00
Ying Wang
d86f39cab7 Merge "Ignore .*.java files when collecting .java files." 2015-08-04 19:52:06 +00:00
Ying Wang
4aedea90e8 Ignore .*.java files when collecting .java files. 
Bug: 22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
 2015-08-04 12:46:13 -07:00
Ying Wang
7d985ffb1e am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit '5c78a488d0b7d293c254493a9fc5fc71bc50b011':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:28:05 +00:00
Ying Wang
0a0e6eae3f Build static ckati on Linux. 
Bug: 22798670
Change-Id: I3aaf127627c1c478ab3af2549e49506d4d1f19df
 2015-08-04 12:23:27 -07:00
Ying Wang
5c78a488d0 am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:21:38 +00:00
Ying Wang
eadaa954ce Fix writing clean_steps.mk in the first build. 
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
 2015-08-04 12:11:54 -07:00
Stephen Smalley
d3a803e668 build: switch over to file_contexts.bin only 
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-08-04 14:59:06 -04:00
Ying Wang
c7b8ee0974 am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:21:01 +00:00
Ying Wang
32350fc547 am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit '5c3adca4011db8fd98a3b7beab76b5b02cbab063':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:18:48 +00:00
Ying Wang
3e3d7b5ce5 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit 66c8e8c756)
 2015-08-03 14:08:54 -07:00
Ying Wang
66c8e8c756 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
 2015-08-03 14:06:58 -07:00
Ying Wang
0a1026ce27 am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit 'ede3e3103565175fc15b76cd6f9daf7e2b93393b':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-01 17:35:31 +00:00
Ying Wang
ede3e31035 am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit '2c0c1e56dbbaa3abf1d25796c94d6a31594b307e':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-01 17:30:34 +00:00
Ying Wang
2c0c1e56db Merge "Build 64-bit host tools in Linux/Mac SDK build." 2015-08-01 17:23:20 +00:00
Daniel Rosenberg
1e6ee759b3 am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
 2015-08-01 00:24:00 +00:00