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
Doug Zongker
2bcfbe7e88
am 32bf3f32
: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Ying Wang
267e957373
Dist the otatools package.
...
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
2015-08-24 17:13:53 -07:00
Tom Cherry
7958b8b6b6
am 2899727f
: am bcbd4eb9
: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:25 +00: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
Doug Zongker
32bf3f3265
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 f22b0f43ef
)
2015-08-24 15:43:40 -07:00
Tom Cherry
2df35aea43
remove TARGET_PROVIDES_INIT_RC
...
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
2015-08-24 13:55:02 -07:00
Christopher Wiley
597a65cad0
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:25:31 +00: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
132f6dea3e
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:07 +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
7ffa77e8e7
am 344c3394
: am 6f534125
: Merge "Fix Linux host checkbuilds."
...
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
Fix Linux host checkbuilds.
2015-08-21 00:12:19 +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
64154b258b
am 30a18bca
: am a3fa59b1
: Merge "Kill host Linux AndroidConfig.h."
...
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
Kill host Linux AndroidConfig.h.
2015-08-20 23:21:15 +00: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
1ceef60a68
am 00da9ced
: am ded991b4
: Merge "Revert "Fix Windows SDK build.""
...
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
Revert "Fix Windows SDK build."
2015-08-20 21:55:04 +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
1dc63f720c
am 0049aecf
: am a6065996
: Merge "Stop defining WIN32."
...
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
Stop defining WIN32.
2015-08-20 21:54:57 +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
7e3ba1b7a7
am 8a3241e3
: am 11a38e7a
: Merge "Support LOCAL_INIT_RC."
...
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
Support LOCAL_INIT_RC.
2015-08-20 21:00:14 +00: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
da2b544765
am 896d0ee2
: am 999fd4ea
: Merge "Also -DWIN32 to keep llvm building."
...
* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
Also -DWIN32 to keep llvm building.
2015-08-20 18:26:29 +00: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