Tao Bao
8c85549a3c
am c9ff5102
: am 35da9685
: Merge "Use the basename of file_contexts from the info dict."
...
* commit 'c9ff5102ad9258f9189afd3bd15eb58cab186215':
Use the basename of file_contexts from the info dict.
2015-08-28 18:56:36 +00:00
Tao Bao
c9ff5102ad
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.
2015-08-28 18:46:31 +00:00
Tao Bao
35da9685f0
Merge "Use the basename of file_contexts from the info dict."
2015-08-28 18:33:25 +00:00
Tao Bao
79735a6a82
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 d3a803e668
Bug: 23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
2015-08-28 11:17:38 -07:00
Dan Willemsen
c222a10d06
am d1746299
: am 57ff23b0
: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
...
* commit 'd174629951530d183015d7f124c993dac9da46aa':
Add support for LOCAL_SRC_FILES_(host)_(arch)
2015-08-28 03:55:06 +00:00
Dan Willemsen
00cf9d5008
am 399c59f3
: am d5deac8d
: Merge "Add _(darwin|linux|windows)"
...
* commit '399c59f3aa3b7f025a8ec5b0b60af402f9954142':
Add _(darwin|linux|windows)
2015-08-28 03:55:05 +00: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
57ff23b0ed
Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
2015-08-28 03:39:34 +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
d5deac8db9
Merge "Add _(darwin|linux|windows)"
2015-08-28 03:37:30 +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
Bill Yi
ab0f24d9b5
am a04a15b2
: Merge commit \'18d9bd19a4fd75fc7951b43ba01167838f8bb2ac\' into HEAD
...
* commit 'a04a15b262b81d4ca0835136f1d0f86401e705b5':
2015-08-27 23:37:42 +00:00
Tao Bao
5bf558767d
am 4988f18b
: am 6458fd96
: Merge "rangelib.py: Fix the bug in monotonic check."
...
* commit '4988f18b1f0884eb1365820cb365fc6a6d082d1d':
rangelib.py: Fix the bug in monotonic check.
2015-08-27 23:37:41 +00:00
Bill Yi
a04a15b262
Merge commit '18d9bd19a4fd75fc7951b43ba01167838f8bb2ac' into HEAD
2015-08-27 15:09:29 -07:00
Tao Bao
4988f18b1f
am 6458fd96
: Merge "rangelib.py: Fix the bug in monotonic check."
...
* commit '6458fd96d5d0cd3b54a02a5f9c276f49e566cb53':
rangelib.py: Fix the bug in monotonic check.
2015-08-27 20:44:35 +00:00
Tao Bao
6458fd96d5
Merge "rangelib.py: Fix the bug in monotonic check."
2015-08-27 19:16:06 +00:00
Tao Bao
044bd31e50
am 575643a8
: am 14342066
: Merge "Add unit tests for rangelib.py."
...
* commit '575643a85d41a428aeda6676146d86b0356e0785':
Add unit tests for rangelib.py.
2015-08-27 12:40:31 +00:00
Tao Bao
575643a85d
am 14342066
: Merge "Add unit tests for rangelib.py."
...
* commit '14342066dbaec25593c12fdba5396d4ca9cad841':
Add unit tests for rangelib.py.
2015-08-27 05:23:08 +00:00
Tao Bao
c314b8ce32
am 8b528fc3
: (-s ours) am 68319cdf
: am 95708eea
: Merge "Split large files for BBOTA v3."
...
* commit '8b528fc3ef7516b53f74b37e4fb709b254471587':
2015-08-27 05:02:36 +00:00
Bart Sears
a47dd9727e
am 4535d7cb
: (-s ours) am c69aa42b
: Merge "Set the Security Patch level for MNC" into mnc-dev
...
* commit '4535d7cb345d82b627030eb19fc12c3ac6e95676':
2015-08-27 05:02:34 +00:00
Tao Bao
12eaafd9cf
am 967b52fb
: (-s ours) am afc5ab39
: am c6e087ad
: resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
* commit '967b52fb0b4589275d347f8e76bd3fcc9bb209a4':
2015-08-27 05:02:33 +00:00
Nick Kralevich
66270b69d4
am 64e4d8a2
: (-s ours) am 35a075db
: am 36d91b53
: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '64e4d8a211546cde5ff5d4dea8ef69c86ed38067':
2015-08-27 05:02:31 +00:00
Konstantinos Menychtas
b5edbf8679
am d2524d00
: (-s ours) am ca19158e
: am e9a8f465
: (-s ours) resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
* commit 'd2524d00c284e1c7d3735d6ce49e49ed90d223fc':
2015-08-27 05:02:30 +00:00
Ying Wang
cfab01b310
am c9343c0b
: (-s ours) am cf129c53
: am a7eaf450
: Merge "Dist the otatools package."
...
* commit 'c9343c0bc316536772700926d555be42783fac62':
2015-08-27 05:02:29 +00:00
Tom Cherry
f6e07c1c87
am 00c9b1b3
: (-s ours) am 2899727f
: am bcbd4eb9
: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '00c9b1b3239ea5882a9089d0a81079cae6bdf5ae':
2015-08-27 05:02:27 +00:00
smain@google.com
8fbcdcaace
am 6e0cca08
: (-s ours) 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
...
* commit '6e0cca08763c831176c2f65bbde8bd90668304fe':
2015-08-27 05:02:26 +00:00
Christopher Wiley
8a3dd00f23
am 3f7c5424
: (-s ours) am 2b2c9dff
: am 4e719eaf
: Merge "Change .dbus.xml extension to .dbus-xml"
...
* commit '3f7c5424dbbf5b827ed912a5383bdc31dced7cec':
2015-08-27 05:02:24 +00:00
Shinichiro Hamaji
41374088f5
am 8a0607f0
: (-s ours) am b3cd0a56
: am 39c7d243
: Merge "Use goma when USE_GOMA=true is set"
...
* commit '8a0607f0695b24d73d77c3915ebe29229f732079':
2015-08-27 05:02:23 +00:00
Elliott Hughes
39392f0481
am dc289ce1
: (-s ours) am 344c3394
: am 6f534125
: Merge "Fix Linux host checkbuilds."
...
* commit 'dc289ce17c1f009e3054d0c176b2aefc78887b9e':
2015-08-27 05:02:21 +00:00
Elliott Hughes
8d395444b2
am 158800c9
: (-s ours) am 30a18bca
: am a3fa59b1
: Merge "Kill host Linux AndroidConfig.h."
...
* commit '158800c9edc2edb2e946c7c45929a1bede34090c':
2015-08-27 05:02:20 +00:00
Elliott Hughes
b97a5f276d
am b4ec57c0
: (-s ours) am 00da9ced
: am ded991b4
: Merge "Revert "Fix Windows SDK build.""
...
* commit 'b4ec57c01621c768c8a8d92957dd824735f6a6cc':
2015-08-27 05:02:18 +00:00
Elliott Hughes
241eca25ce
am 7f45f953
: (-s ours) am 0049aecf
: am a6065996
: Merge "Stop defining WIN32."
...
* commit '7f45f953add5181a4faeb40c6e25180267ae4d9c':
2015-08-27 05:02:16 +00:00
Ying Wang
b234b35101
am 4270d91b
: (-s ours) am 8a3241e3
: am 11a38e7a
: Merge "Support LOCAL_INIT_RC."
...
* commit '4270d91bbe06a3db32a9e52ba2939f26c05961b7':
2015-08-27 05:02:15 +00:00
Elliott Hughes
bb89c75397
am 59b3bd27
: (-s ours) am 896d0ee2
: am 999fd4ea
: Merge "Also -DWIN32 to keep llvm building."
...
* commit '59b3bd27a05636afa50d72167fe2ef09c6986f9e':
2015-08-27 05:02:13 +00:00
Elliott Hughes
bf14129e4f
am 29e8a329
: (-s ours) am 9f9d2aed
: am 79b199b8
: Merge "Fix Windows SDK build."
...
* commit '29e8a32972bf2ad0e5fddc4c92f5cc6e5c0763c6':
2015-08-27 05:02:11 +00:00
Elliott Hughes
9c3dac5b33
am a65473b0
: (-s ours) am 896b9c60
: am 57069e59
: Merge "Remove Windows AndroidConfig.h."
...
* commit 'a65473b0e7d133c41c41494f0c36bc586fae3261':
2015-08-27 05:02:09 +00:00
Shinichiro Hamaji
c3113c54b9
am 50479339
: (-s ours) am 9e7efdf3
: am e7d6f04d
: Merge "Add two flags for the latest ckati"
...
* commit '5047933993fd499aca494bec172734ee9b5de03e':
2015-08-27 05:02:07 +00:00
Dan Albert
f7924ec7ec
am a8803f0b
: (-s ours) am 54e0b7de
: am 6b966aff
: Merge "Fix sanitizer choice for global vs module."
...
* commit 'a8803f0b3cec5c9e7d97cc3aaa633a2aaaa3359e':
2015-08-27 05:02:02 +00:00
Elliott Hughes
ae23a3bb2d
am 33a14397
: (-s ours) am 088849e2
: am b3c585d7
: Merge "Stop defining HAVE_MS_C_RUNTIME."
...
* commit '33a14397960dc9cb41bc8cb3c32274cfc4e487c6':
2015-08-27 05:01:57 +00:00
Christopher Wiley
2188fccb7b
am 5bc62fdc
: (-s ours) am 7db39448
: am 9e3b4ed4
: Merge "Fix DBus proxies to use all definitions"
...
* commit '5bc62fdc652d80eff823cecdcbcc8144170c9ad3':
2015-08-27 05:01:55 +00:00
Christopher Wiley
36b59dff5f
am 9c49f0af
: (-s ours) am 688b4a3d
: am 4d2b79f9
: Merge "Generate DBus proxies and adaptors separately"
...
* commit '9c49f0affa43b946d2618eb2efbddf15588998c8':
2015-08-27 05:01:53 +00:00
Tao Bao
d024f6bbcf
am 42a2b83c
: (-s ours) am d88eaf02
: am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit '42a2b83c535e73bd626696e1f3f96b4f9dfc4dde':
2015-08-27 05:01:51 +00:00
Konstantinos Menychtas
4ab626159f
am 8694cf75
: (-s ours) am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '8694cf75b60c96e417163fc6d81e4760a501f089':
2015-08-27 05:01:49 +00:00
Chih-hung Hsieh
0c1eb672e1
am 2cc00c30
: (-s ours) am 3eccd047
: am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '2cc00c305caba6ddfd79bdc2cf58673a9dd524b3':
2015-08-27 05:01:47 +00:00
Ying Wang
a181d39b49
am 64c9868b
: (-s ours) am 71327b90
: am 42fa1948
: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
...
* commit '64c9868bea1d791ee2c571259467e289b02c3f05':
2015-08-27 05:01:45 +00:00
Ying Wang
f841d2b809
am ac9b5af5
: (-s ours) am f526c169
: (-s ours) am c3dcb6c0
: Merge "Consolidate the nanopb-c and regular protobuf build rules."
...
* commit 'ac9b5af50f84ad83bfa057e42db9c821b76211e5':
2015-08-27 05:01:43 +00:00
Tao Bao
0b39ee5b79
am 20c68b74
: (-s ours) am 5d690a37
: am ab9a3588
: Merge "Revise stash for BBOTAs when needed."
...
* commit '20c68b749475bc5d8f5784105036a8cd7cedfce0':
2015-08-27 05:01:41 +00:00
Dan Willemsen
0a855fd42c
am 1b148467
: (-s ours) am 48d95e75
: am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '1b14846717876e8e6372ffc82f0874925fcacbf7':
2015-08-27 05:01:39 +00:00
Dan Willemsen
1ae7750e46
am 9cf990be
: (-s ours) resolved conflicts for merge of 05fae7e0
to mnc-dev-plus-aosp
...
* commit '9cf990beec6ef42c09c39e49d3e5991e96a9608b':
2015-08-27 05:01:34 +00:00