OSDN Git Service
smain@google.com [Mon, 24 Aug 2015 16:41:10 +0000 (16:41 +0000)]
am
ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr
* commit '
ed7e864a735f004f1dbb4a2db5261855b5693913':
fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Christopher Wiley [Fri, 21 Aug 2015 22:24:31 +0000 (22:24 +0000)]
am
2b2c9dff: am
4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml"
* commit '
2b2c9dff35304c21ebe1e793a16443a882920f75':
Change .dbus.xml extension to .dbus-xml
Christopher Wiley [Fri, 21 Aug 2015 20:51:11 +0000 (20:51 +0000)]
am
4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml"
* commit '
4e719eafc4d183dd923518cea6292f37ee1e26c6':
Change .dbus.xml extension to .dbus-xml
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:36:12 +0000 (03:36 +0000)]
am
b3cd0a56: am
39c7d243: Merge "Use goma when USE_GOMA=true is set"
* commit '
b3cd0a566391726a69d9f0e439268f4caf5df7db':
Use goma when USE_GOMA=true is set
Shinichiro Hamaji [Fri, 21 Aug 2015 03:29:49 +0000 (03:29 +0000)]
am
39c7d243: Merge "Use goma when USE_GOMA=true is set"
* commit '
39c7d243395ad3f2015571aaf902dc4d4686e981':
Use goma when USE_GOMA=true is set
Shinichiro Hamaji [Fri, 21 Aug 2015 03:24:27 +0000 (03:24 +0000)]
Merge "Use goma when USE_GOMA=true is set"
Elliott Hughes [Fri, 21 Aug 2015 00:11:53 +0000 (00:11 +0000)]
am
344c3394: am
6f534125: Merge "Fix Linux host checkbuilds."
* commit '
344c33949b48ec5f3d27bff36f145f157156cf19':
Fix Linux host checkbuilds.
Elliott Hughes [Fri, 21 Aug 2015 00:05:12 +0000 (00:05 +0000)]
am
6f534125: Merge "Fix Linux host checkbuilds."
* commit '
6f5341259c6b6684acb4e91d9220593c231abecd':
Fix Linux host checkbuilds.
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:20:21 +0000 (23:20 +0000)]
am
30a18bca: am
a3fa59b1: Merge "Kill host Linux AndroidConfig.h."
* commit '
30a18bca6222065d15e1b18d71a29a8fb921d4a8':
Kill host Linux AndroidConfig.h.
Elliott Hughes [Thu, 20 Aug 2015 23:14:41 +0000 (23:14 +0000)]
am
a3fa59b1: Merge "Kill host Linux AndroidConfig.h."
* commit '
a3fa59b12b7346b3d0fbb8c60f890e50c7f51f18':
Kill host Linux AndroidConfig.h.
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:54:58 +0000 (21:54 +0000)]
am
00da9ced: am
ded991b4: Merge "Revert "Fix Windows SDK build.""
* commit '
00da9cede0b4199d3b6dea73b61afa8610b5c339':
Revert "Fix Windows SDK build."
Elliott Hughes [Thu, 20 Aug 2015 21:54:57 +0000 (21:54 +0000)]
am
0049aecf: am
a6065996: Merge "Stop defining WIN32."
* commit '
0049aecf1763ea939cdf91e4e70fda67eb2efbee':
Stop defining WIN32.
Elliott Hughes [Thu, 20 Aug 2015 21:43:17 +0000 (21:43 +0000)]
am
ded991b4: Merge "Revert "Fix Windows SDK build.""
* commit '
ded991b47d0235bd505b5d95e438118d0b7f1041':
Revert "Fix Windows SDK build."
Elliott Hughes [Thu, 20 Aug 2015 21:43:16 +0000 (21:43 +0000)]
am
a6065996: Merge "Stop defining WIN32."
* commit '
a6065996cd280acf11f199c1f90e1b8886635207':
Stop defining WIN32.
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 21:00:07 +0000 (21:00 +0000)]
am
8a3241e3: am
11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '
8a3241e39ad541666aeff291b088e7277b5519ca':
Support LOCAL_INIT_RC.
Ying Wang [Thu, 20 Aug 2015 20:53:32 +0000 (20:53 +0000)]
am
11a38e7a: Merge "Support LOCAL_INIT_RC."
* commit '
11a38e7a9164bc3268344ce716c4bd12b08cb05c':
Support LOCAL_INIT_RC.
Ying Wang [Thu, 20 Aug 2015 20:47:53 +0000 (20:47 +0000)]
Merge "Support LOCAL_INIT_RC."
Elliott Hughes [Thu, 20 Aug 2015 19:32:39 +0000 (19:32 +0000)]
am
896d0ee2: am
999fd4ea: Merge "Also -DWIN32 to keep llvm building."
* commit '
896d0ee2cf123f045af859d7291dba65a0b7d789':
Also -DWIN32 to keep llvm building.
Elliott Hughes [Thu, 20 Aug 2015 19:32:34 +0000 (19:32 +0000)]
am
9f9d2aed: am
79b199b8: Merge "Fix Windows SDK build."
* commit '
9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
Fix Windows SDK build.
Elliott Hughes [Thu, 20 Aug 2015 19:32:30 +0000 (19:32 +0000)]
am
896b9c60: am
57069e59: Merge "Remove Windows AndroidConfig.h."
* commit '
896b9c603938220ea40f75a07aef8ec1a0664f37':
Remove Windows AndroidConfig.h.
Shinichiro Hamaji [Thu, 20 Aug 2015 19:31:56 +0000 (19:31 +0000)]
am
9e7efdf3: am
e7d6f04d: Merge "Add two flags for the latest ckati"
* commit '
9e7efdf3e659c2de002b96ec27589f12c1f01512':
Add two flags for the latest ckati
Dan Albert [Thu, 20 Aug 2015 19:31:54 +0000 (19:31 +0000)]
am
54e0b7de: am
6b966aff: Merge "Fix sanitizer choice for global vs module."
* commit '
54e0b7de2ba60b8c769b985be397317790dcfd75':
Fix sanitizer choice for global vs module.
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 18:18:50 +0000 (18:18 +0000)]
am
999fd4ea: Merge "Also -DWIN32 to keep llvm building."
* commit '
999fd4ea850b494f38ac23195ad5c2ee0b9486a2':
Also -DWIN32 to keep llvm building.
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:26:50 +0000 (17:26 +0000)]
am
79b199b8: Merge "Fix Windows SDK build."
* commit '
79b199b80e98ff7d0340de8c55f0da6d085e9ef8':
Fix Windows SDK build.
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 17:06:48 +0000 (17:06 +0000)]
am
57069e59: Merge "Remove Windows AndroidConfig.h."
* commit '
57069e5974c3224550c3cf3a12dbe6ffac4b0c79':
Remove Windows AndroidConfig.h.
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:31:30 +0000 (05:31 +0000)]
am
e7d6f04d: Merge "Add two flags for the latest ckati"
* commit '
e7d6f04d32c26e1355a1a01008941477c1432611':
Add two flags for the latest ckati
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:13:56 +0000 (05:13 +0000)]
am
6b966aff: Merge "Fix sanitizer choice for global vs module."
* commit '
6b966aff43fc4d80b8f35ef2a333107f68ac2be0':
Fix sanitizer choice for global vs module.
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
smain@google.com [Thu, 20 Aug 2015 00:36:57 +0000 (17:36 -0700)]
fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
Elliott Hughes [Wed, 19 Aug 2015 22:31:13 +0000 (22:31 +0000)]
am
088849e2: am
b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME."
* commit '
088849e24da28e398179cd915f142ca4224e6888':
Stop defining HAVE_MS_C_RUNTIME.
Christopher Wiley [Wed, 19 Aug 2015 22:31:10 +0000 (22:31 +0000)]
am
7db39448: am
9e3b4ed4: Merge "Fix DBus proxies to use all definitions"
* commit '
7db39448409ef9797089774ca8e196142662b0f2':
Fix DBus proxies to use all definitions
Christopher Wiley [Wed, 19 Aug 2015 22:31:03 +0000 (22:31 +0000)]
am
688b4a3d: am
4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '
688b4a3db72b58e8908ecdb24e6c4d64a44fdbc6':
Generate DBus proxies and adaptors separately
Elliott Hughes [Wed, 19 Aug 2015 22:18:33 +0000 (22:18 +0000)]
am
b3c585d7: Merge "Stop defining HAVE_MS_C_RUNTIME."
* commit '
b3c585d745918bebb6e4ea72ad60875adf53337e':
Stop defining HAVE_MS_C_RUNTIME.
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:47:27 +0000 (21:47 +0000)]
am
9e3b4ed4: Merge "Fix DBus proxies to use all definitions"
* commit '
9e3b4ed4991eb19e60346858bfdbb494d9324252':
Fix DBus proxies to use all definitions
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:37:48 +0000 (18:37 +0000)]
am
4d2b79f9: Merge "Generate DBus proxies and adaptors separately"
* commit '
4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
Generate DBus proxies and adaptors separately
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:46:41 +0000 (02:46 +0000)]
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.
Tao Bao [Wed, 19 Aug 2015 02:39:21 +0000 (02:39 +0000)]
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.
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."
Konstantinos Menychtas [Wed, 19 Aug 2015 01:40:09 +0000 (01:40 +0000)]
am
956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '
956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
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:22:23 +0000 (22:22 +0000)]
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.
Chih-hung Hsieh [Tue, 18 Aug 2015 22:17:31 +0000 (22:17 +0000)]
am
59c858fc: Merge "Remove special x86 flag that disables tail call optimization."
* commit '
59c858fc94d4cf45a260da81176372ca2a4b77ef':
Remove special x86 flag that disables tail call optimization.
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:51:40 +0000 (21:51 +0000)]
am
71327b90: am
42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
* commit '
71327b90d8b2c2f9b1b3c993dcb907f3a225a7b8':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Ying Wang [Tue, 18 Aug 2015 21:51:39 +0000 (21:51 +0000)]
am
f526c169: (-s ours) am
c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit '
f526c169efd3da99e2fa01d76e4efec0f2f4f36a':
Consolidate the nanopb-c and regular protobuf build rules.
Ying Wang [Tue, 18 Aug 2015 21:41:05 +0000 (21:41 +0000)]
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.
Ying Wang [Tue, 18 Aug 2015 21:41:03 +0000 (21:41 +0000)]
am
c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit '
c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
Consolidate the nanopb-c and regular protobuf build rules.
Ying Wang [Tue, 18 Aug 2015 21:35:42 +0000 (21:35 +0000)]
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
Ying Wang [Tue, 18 Aug 2015 21:35:37 +0000 (21:35 +0000)]
Merge "Consolidate the nanopb-c and regular protobuf build rules."
Ying Wang [Wed, 8 Apr 2015 16:54:34 +0000 (09:54 -0700)]
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug:
20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
Ying Wang [Tue, 7 Apr 2015 18:59:34 +0000 (11:59 -0700)]
Consolidate the nanopb-c and regular protobuf build rules.
Bug:
20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Tao Bao [Tue, 18 Aug 2015 17:25:09 +0000 (17:25 +0000)]
am
5d690a37: am
ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '
5d690a37d4b3b33dee1cfc2a64b66ed4e9c03460':
Revise stash for BBOTAs when needed.
Tao Bao [Tue, 18 Aug 2015 17:21:09 +0000 (17:21 +0000)]
am
ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '
ab9a3588011ebe62eb18e425de02a50fe919b645':
Revise stash for BBOTAs when needed.
Tao Bao [Tue, 18 Aug 2015 16:59:05 +0000 (16:59 +0000)]
Merge "Revise stash for BBOTAs when needed."
Dan Willemsen [Tue, 18 Aug 2015 04:43:04 +0000 (04:43 +0000)]
am
48d95e75: am
05d97fe7: Merge "Remove legacy windows platform build support"
* commit '
48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
Dan Willemsen [Tue, 18 Aug 2015 04:37:09 +0000 (04:37 +0000)]
am
05d97fe7: Merge "Remove legacy windows platform build support"
* commit '
05d97fe723ea376edb5fe6b12535485311a32418':
Remove legacy windows platform build support
Dan Willemsen [Tue, 18 Aug 2015 04:31:07 +0000 (04:31 +0000)]
Merge "Remove legacy windows platform build support"
Dan Willemsen [Tue, 18 Aug 2015 03:50:48 +0000 (20:50 -0700)]
resolved conflicts for merge of
05fae7e0 to mnc-dev-plus-aosp
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
Dan Willemsen [Tue, 18 Aug 2015 03:35:44 +0000 (03:35 +0000)]
am
e6510750: Merge "Use repeatable timestamps"
* commit '
e65107508adbea88fcc1ec51dcf28d4216365753':
Use repeatable timestamps
Dan Willemsen [Tue, 18 Aug 2015 03:30:11 +0000 (03:30 +0000)]
Merge "Use repeatable timestamps"
Ying Wang [Tue, 18 Aug 2015 00:18:48 +0000 (00:18 +0000)]
am
808f0541: am
77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit '
808f0541bba725c4fdc9d2b425a305eeeb024e39':
Set up dependency on ADDRESS_SANITIZER_LINKER
Ying Wang [Tue, 18 Aug 2015 00:11:11 +0000 (00:11 +0000)]
am
77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit '
77128117d8b7811b86ba89e963f8a96cc6c55a6b':
Set up dependency on ADDRESS_SANITIZER_LINKER
Ying Wang [Tue, 18 Aug 2015 00:06:52 +0000 (00:06 +0000)]
Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
Ying Wang [Mon, 17 Aug 2015 23:13:24 +0000 (16:13 -0700)]
Set up dependency on ADDRESS_SANITIZER_LINKER
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.
Bug:
22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
Dan Albert [Mon, 17 Aug 2015 22:46:38 +0000 (22:46 +0000)]
am
9496ef90: am
c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '
9496ef903ff9402859ac82cc339708c15fcd30f6':
Add BUILD(_HOST)?_FUZZ_TEST.
Dan Albert [Mon, 17 Aug 2015 22:39:25 +0000 (22:39 +0000)]
am
c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '
c0018b04e984180122ab615d8dbea09a3230ef7f':
Add BUILD(_HOST)?_FUZZ_TEST.
Dan Albert [Mon, 17 Aug 2015 22:32:58 +0000 (22:32 +0000)]
Merge "Add BUILD(_HOST)?_FUZZ_TEST."
Dan Albert [Thu, 30 Jul 2015 23:56:30 +0000 (16:56 -0700)]
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
Elliott Hughes [Mon, 17 Aug 2015 20:38:41 +0000 (20:38 +0000)]
am
a9a433bd: am
648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '
a9a433bdcde19b3262f5eab6f4ee59b88673ec07':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Elliott Hughes [Mon, 17 Aug 2015 20:31:52 +0000 (20:31 +0000)]
am
648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '
648f2011a6fcf1fcb4a67b5d49a1c9d29877bc17':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Elliott Hughes [Mon, 17 Aug 2015 20:25:36 +0000 (20:25 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
Dan Albert [Mon, 17 Aug 2015 20:24:05 +0000 (20:24 +0000)]
am
8d61be6c: am
f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '
8d61be6c781277ae3f5423c805092220a961b102':
Don't filter on a non-existent variable.
Dan Albert [Mon, 17 Aug 2015 20:19:30 +0000 (20:19 +0000)]
am
f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '
f9b75b1b24d985c873e548d4fd7945a6cdd99323':
Don't filter on a non-existent variable.