Ying Wang
da885b90e4
am 71d4c95f
: Merge "Fix typo."
...
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
Fix typo.
2015-04-02 19:57:49 +00:00
Ying Wang
71d4c95f83
Merge "Fix typo."
2015-04-02 19:49:13 +00:00
Ying Wang
36b039a2d6
Fix typo.
...
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
2015-04-02 12:48:32 -07:00
Dan Albert
57d71306a5
am 8f7338d9
: am dc8d7092
: am 0064c51e
: Merge "Use prebuilt libclang_rt.profile."
...
* commit '8f7338d9b145379ea9c51b7e551509a2d8f0f24e':
Use prebuilt libclang_rt.profile.
2015-04-02 18:49:26 +00:00
Dan Albert
8f7338d9b1
am dc8d7092
: am 0064c51e
: Merge "Use prebuilt libclang_rt.profile."
...
* commit 'dc8d7092db0b2d5754931ae130da5b1790a7d670':
Use prebuilt libclang_rt.profile.
2015-04-02 18:25:35 +00:00
Dan Albert
dc8d7092db
am 0064c51e
: Merge "Use prebuilt libclang_rt.profile."
...
* commit '0064c51efee452daae110eac99b1321c00652c17':
Use prebuilt libclang_rt.profile.
2015-04-02 18:14:48 +00:00
Claes Elgemark
ed1158e01f
Don't fail build of otatools if there are no device certificates
...
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-04-02 17:38:29 +00:00
Etan Cohen
c74a3b4cae
Merge "Merge commit '597cfdb' into merge"
2015-04-02 03:11:00 +00:00
Dan Albert
343ed674e3
Use prebuilt libclang_rt.profile.
...
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
2015-04-01 19:03:22 -07:00
Stephen Hines
55ae50dc1d
am 95212b90
: am 31f35975
: am 9a98c47c
: Merge "Don\'t warn on definition of possibly reserved identifiers."
...
* commit '95212b900b7a9a205d6f8b79dc3fcc07576c18cd':
Don't warn on definition of possibly reserved identifiers.
2015-04-01 22:09:03 +00:00
Neil Fuller
57df23e40a
am 080d2f32
: am 2e4c6762
: am 2ff6a3bb
: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
...
* commit '080d2f32add01c513913ec50acd9defee9cb7dfa':
Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 19:13:29 +00:00
Stephen Hines
95212b900b
am 31f35975
: am 9a98c47c
: Merge "Don\'t warn on definition of possibly reserved identifiers."
...
* commit '31f35975178e00c1178433bbbdefa0e27bee9750':
Don't warn on definition of possibly reserved identifiers.
2015-04-01 19:09:58 +00:00
Stephen Hines
31f3597517
am 9a98c47c
: Merge "Don\'t warn on definition of possibly reserved identifiers."
...
* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
Don't warn on definition of possibly reserved identifiers.
2015-04-01 18:59:07 +00:00
Stephen Hines
9a98c47c64
Merge "Don't warn on definition of possibly reserved identifiers."
2015-04-01 18:50:29 +00:00
Neil Fuller
080d2f32ad
am 2e4c6762
: am 2ff6a3bb
: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
...
* commit '2e4c67624c7f7d071d93d734cda024acea759582':
Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 18:05:28 +00:00
Neil Fuller
2e4c67624c
am 2ff6a3bb
: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
...
* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 17:54:44 +00:00
Neil Fuller
2ff6a3bbdf
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
2015-04-01 17:43:54 +00:00
Tao Bao
521a8dbd18
am 93d46584
: am ae26f5b0
: am 53602955
: Merge "Add support to sign bootable images with vboot_signer"
...
* commit '93d46584170a9aae1728cdb9010eef41e25b4d4a':
Add support to sign bootable images with vboot_signer
2015-04-01 17:33:36 +00:00
Dan Albert
cb8436b78f
am 320d9764
: am 071af0ac
: am b8765797
: Merge "Add unwinder linking to STL setup."
...
* commit '320d976429f0f08b9954edca13930442f63300a8':
Add unwinder linking to STL setup.
2015-04-01 17:27:34 +00:00
Dan Albert
7d1c9d312d
am 8985a409
: am 0ea16fcc
: am 60335c03
: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
...
* commit '8985a409b75e23dcadd0cb743a344876a95eb5d8':
Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 17:27:32 +00:00
Tao Bao
93d4658417
am ae26f5b0
: am 53602955
: Merge "Add support to sign bootable images with vboot_signer"
...
* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
Add support to sign bootable images with vboot_signer
2015-04-01 17:15:29 +00:00
Tao Bao
ae26f5b002
am 53602955
: Merge "Add support to sign bootable images with vboot_signer"
...
* commit '536029551d31d8084c444063349291781ee43ae1':
Add support to sign bootable images with vboot_signer
2015-04-01 17:05:36 +00:00
Neil Fuller
391d4e9c75
Add explicit dependency on tzdata_updates_intermediates for CTS
...
The build was working on AOSP, but fails downstream when using
Jack because the javalib.jar file needed by CTS is not being
built by default there.
Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0
2015-04-01 18:02:46 +01:00
Dan Albert
320d976429
am 071af0ac
: am b8765797
: Merge "Add unwinder linking to STL setup."
...
* commit '071af0ac49ab87e4d365056a8ff764177f56b428':
Add unwinder linking to STL setup.
2015-04-01 16:59:48 +00:00
Dan Albert
8985a409b7
am 0ea16fcc
: am 60335c03
: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
...
* commit '0ea16fcca3383bda04e873032d7721324ec90c42':
Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 16:59:46 +00:00
Tao Bao
536029551d
Merge "Add support to sign bootable images with vboot_signer"
2015-04-01 16:54:44 +00:00
Dan Albert
071af0ac49
am b8765797
: Merge "Add unwinder linking to STL setup."
...
* commit 'b8765797a89eebc97e38afcb94a965d69a8663ef':
Add unwinder linking to STL setup.
2015-04-01 16:49:11 +00:00
Dan Albert
0ea16fcca3
am 60335c03
: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
...
* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 16:49:10 +00:00
Tao Bao
d95e9fd267
Add support to sign bootable images with vboot_signer
...
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.
Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
2015-04-01 09:23:08 -07:00
Dan Albert
5036729c41
Add unwinder linking to STL setup.
...
Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.
Bug: 18471342
Bug: 19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
2015-03-31 18:29:23 -07:00
Dan Albert
91f713a168
Revert "Revert "Fix the libgcc/libatomic link order.""
...
This reverts commit e440c3c07b
.
2015-03-31 16:42:52 -07:00
Neil Fuller
e635e67252
am 0fd4a729
: am 2f78e36d
: am 3cc6a0f2
: Merge "Addition of a CTS suite for tzdata update code"
...
* commit '0fd4a7293ec1d252fcd5ad74ab12d7782b0d92bf':
Addition of a CTS suite for tzdata update code
2015-03-31 10:22:15 +00:00
Neil Fuller
0fd4a7293e
am 2f78e36d
: am 3cc6a0f2
: Merge "Addition of a CTS suite for tzdata update code"
...
* commit '2f78e36ddee92938a9dddd0484781037b5b496eb':
Addition of a CTS suite for tzdata update code
2015-03-31 09:31:59 +00:00
Neil Fuller
2f78e36dde
am 3cc6a0f2
: Merge "Addition of a CTS suite for tzdata update code"
...
* commit '3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
Addition of a CTS suite for tzdata update code
2015-03-31 09:25:12 +00:00
Neil Fuller
3cc6a0f22f
Merge "Addition of a CTS suite for tzdata update code"
2015-03-31 08:30:51 +00:00
Etan Cohen
5c92a46ea3
Merge commit '597cfdb' into merge
...
Change-Id: I4df718345626439ece9fdad242cccea7d6930819
2015-03-30 16:42:42 -07:00
Chih-hung Hsieh
cdac639599
am 29b415aa
: am 1e9b11f4
: am d63c78e0
: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit '29b415aa7781b27fc4948307acc5961cd702dac2':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:49:27 +00:00
Chih-hung Hsieh
29b415aa77
am 1e9b11f4
: am d63c78e0
: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:26:15 +00:00
Chih-hung Hsieh
1e9b11f4b1
am d63c78e0
: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit 'd63c78e058da1418db133f62df4ace6f8109965b':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:17:43 +00:00
Chih-hung Hsieh
d63c78e058
Merge "Allow -mcpu=cortex-a15 for clang"
2015-03-27 22:33:04 +00:00
Ying Wang
f6dfd7b608
am ddc5a8f7
: am 8ffec13d
: Merge "Add back Java resources to apk without Java code."
...
* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
Add back Java resources to apk without Java code.
2015-03-27 21:09:39 +00:00
Ying Wang
ddc5a8f78c
am 8ffec13d
: Merge "Add back Java resources to apk without Java code."
...
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
Add back Java resources to apk without Java code.
2015-03-27 18:47:31 +00:00
Ying Wang
454bcff255
Add back Java resources to apk without Java code.
...
With commit 33360dd569
we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.
(cherry-picked from commit 8b27d1879c
)
Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
2015-03-27 11:30:51 -07:00
Ying Wang
e01d2ab927
Merge "Add back Java resources to apk without Java code."
2015-03-27 18:17:12 +00:00
Nicholas Sauer
d7af937a03
Merge "Add required projects to pdk build on master."
2015-03-27 18:16:04 +00:00
Ying Wang
8b27d1879c
Add back Java resources to apk without Java code.
...
With commit 33360dd569
we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.
Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
2015-03-27 11:15:17 -07:00
Nicholas Sauer
52b0026f90
Merge "Add classes.jack to the pdk build"
2015-03-27 18:02:42 +00:00
Ying Wang
b6b83e9f99
am 8853f518
: am 55adb5a3
: am 1b23b33d
: Merge "MKBOOTIMG override were missing in two places"
...
* commit '8853f5181b1ae1682d9433c28e120f25f63a4721':
MKBOOTIMG override were missing in two places
2015-03-27 17:15:46 +00:00
Ying Wang
8853f5181b
am 55adb5a3
: am 1b23b33d
: Merge "MKBOOTIMG override were missing in two places"
...
* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
MKBOOTIMG override were missing in two places
2015-03-27 16:59:35 +00:00
Ying Wang
55adb5a380
am 1b23b33d
: Merge "MKBOOTIMG override were missing in two places"
...
* commit '1b23b33d92f32626584153739308e9147d1541bd':
MKBOOTIMG override were missing in two places
2015-03-27 16:52:49 +00:00