OSDN Git Service
Shinichiro Hamaji [Tue, 1 Sep 2015 16:37:44 +0000 (16:37 +0000)]
am
ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true"
* commit '
ec8f973147c3eacb048dd486c9534562f0328303':
Show error message when resource limit too low for USE_GOMA=true
Dan Willemsen [Tue, 1 Sep 2015 16:37:42 +0000 (16:37 +0000)]
am
d0ae4796: Merge "Blacklist libc++ from windows host builds"
* commit '
d0ae4796a10b9855a738c5f5c79e603cac30cb9f':
Blacklist libc++ from windows host builds
Richard Uhler [Tue, 1 Sep 2015 16:36:23 +0000 (16:36 +0000)]
am
e4c753f4: Merge "Add ahat to runtime_libart product."
* commit '
e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
Ying Wang [Tue, 1 Sep 2015 16:35:59 +0000 (16:35 +0000)]
am
8838c72e: Merge "Cleaned the outdated incrementaljavac."
* commit '
8838c72e8a339270fb3bea3d467200c6c0c28782':
Cleaned the outdated incrementaljavac.
Ying Wang [Tue, 1 Sep 2015 16:31:56 +0000 (09:31 -0700)]
resolved conflicts for merge of
a15ae216 to stage-aosp-master
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
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:59:18 +0000 (19:59 +0000)]
am
4548e7f4: Merge "Remove AndroidConfig.h."
* commit '
4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
Remove AndroidConfig.h.
Elliott Hughes [Fri, 28 Aug 2015 19:47:36 +0000 (19:47 +0000)]
Merge "Remove AndroidConfig.h."
Tao Bao [Fri, 28 Aug 2015 18:46:31 +0000 (18:46 +0000)]
am
35da9685: Merge "Use the basename of file_contexts from the info dict."
* commit '
35da9685f0d3bb367b50aaa4c476b12907099f77':
Use the basename of file_contexts from the info dict.
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:49:02 +0000 (03:49 +0000)]
am
57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
* commit '
57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
Add support for LOCAL_SRC_FILES_(host)_(arch)
Dan Willemsen [Fri, 28 Aug 2015 03:49:01 +0000 (03:49 +0000)]
am
d5deac8d: Merge "Add _(darwin|linux|windows)"
* commit '
d5deac8db951ec0a1c9edd806ea1758b836f8c46':
Add _(darwin|linux|windows)
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
Bill Yi [Thu, 27 Aug 2015 22:09:29 +0000 (15:09 -0700)]
Tao Bao [Thu, 27 Aug 2015 20:44:35 +0000 (20:44 +0000)]
am
6458fd96: Merge "rangelib.py: Fix the bug in monotonic check."
* commit '
6458fd96d5d0cd3b54a02a5f9c276f49e566cb53':
rangelib.py: Fix the bug in monotonic check.
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 05:23:08 +0000 (05:23 +0000)]
am
14342066: Merge "Add unit tests for rangelib.py."
* commit '
14342066dbaec25593c12fdba5396d4ca9cad841':
Add unit tests for rangelib.py.
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
Ying Wang [Thu, 27 Aug 2015 01:38:15 +0000 (01:38 +0000)]
am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
4fc1467949aaf9e6a49a6771ed996e3c2c702314':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:38:14 +0000 (01:38 +0000)]
am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 01:33:15 +0000 (01:33 +0000)]
am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:27:37 +0000 (01:27 +0000)]
am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
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
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Tao Bao [Wed, 26 Aug 2015 19:55:20 +0000 (19:55 +0000)]
am
68319cdf: am
95708eea: Merge "Split large files for BBOTA v3."
* commit '
68319cdf4762c7c48cff68ede2b7f4bc267db735':
Split large files for BBOTA v3.
Tao Bao [Wed, 26 Aug 2015 19:46:39 +0000 (19:46 +0000)]
am
95708eea: Merge "Split large files for BBOTA v3."
* commit '
95708eea4e50e9048bad13d129aa2f818b808ea8':
Split large files for BBOTA v3.
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
Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]
am
8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '
8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Bart Sears [Wed, 26 Aug 2015 03:47:52 +0000 (03:47 +0000)]
am
c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '
c69aa42b4331569814d23336412e6754a0495d65':
Set the Security Patch level for MNC
Bart Sears [Wed, 26 Aug 2015 03:40:38 +0000 (03:40 +0000)]
Merge "Set the Security Patch level for MNC" into mnc-dev
Tao Bao [Tue, 25 Aug 2015 23:35:45 +0000 (23:35 +0000)]
am
afc5ab39: am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:30:14 +0000 (23:30 +0000)]
am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)]
resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
Nick Kralevich [Tue, 25 Aug 2015 22:53:03 +0000 (22:53 +0000)]
am
35a075db: am
36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
* commit '
35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
Nick Kralevich [Tue, 25 Aug 2015 22:47:48 +0000 (22:47 +0000)]
am
36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
* commit '
36d91b5352035bf5192856b849ddec607ce15b23':
Only allow toolbox exec where /system exec was already allowed.
Nick Kralevich [Tue, 25 Aug 2015 22:41:57 +0000 (22:41 +0000)]
Merge "Only allow toolbox exec where /system exec was already allowed."
Konstantinos Menychtas [Tue, 25 Aug 2015 18:30:57 +0000 (18:30 +0000)]
am
ca19158e: am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
ca19158e034d6e0f5a605698c0f303893a2b9248':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 25 Aug 2015 18:22:28 +0000 (18:22 +0000)]
am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
Ying Wang [Tue, 25 Aug 2015 18:21:13 +0000 (18:21 +0000)]
am
fc028e59: Dist the otatools package.
* commit '
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
Ying Wang [Tue, 25 Aug 2015 17:27:26 +0000 (17:27 +0000)]
am
cf129c53: am
a7eaf450: Merge "Dist the otatools package."
* commit '
cf129c538266cdc5d185a945218e7f76aa22ca27':
Dist the otatools package.
Konstantinos Menychtas [Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)]
resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
Ying Wang [Tue, 25 Aug 2015 17:21:57 +0000 (17:21 +0000)]
am
a7eaf450: Merge "Dist the otatools package."
* commit '
a7eaf450781483791b02241fd6ab62767d4d6f99':
Dist the otatools package.
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>
Bart Sears [Tue, 25 Aug 2015 06:22:20 +0000 (23:22 -0700)]
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
Doug Zongker [Tue, 25 Aug 2015 01:20:34 +0000 (01:20 +0000)]
am
32bf3f32: add otatools-package target
* commit '
32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
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:35:17 +0000 (23:35 +0000)]
am
2899727f: am
bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '
2899727fd7c97729df11c59a4ebf76df73379a28':
remove TARGET_PROVIDES_INIT_RC
Tom Cherry [Mon, 24 Aug 2015 23:28:34 +0000 (23:28 +0000)]
am
bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '
bcbd4eb9fb9c82f35ca46cc9b976a59b6c1645d4':
remove TARGET_PROVIDES_INIT_RC
Tom Cherry [Mon, 24 Aug 2015 23:23:36 +0000 (23:23 +0000)]
Merge "remove TARGET_PROVIDES_INIT_RC"
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
Tom Cherry [Mon, 24 Aug 2015 20:55:02 +0000 (13:55 -0700)]
remove TARGET_PROVIDES_INIT_RC
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
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.