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
Dan Albert
343ed674e3
Use prebuilt libclang_rt.profile.
...
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
2015-04-01 19:03:22 -07: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
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
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
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
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
Ying Wang
1b23b33d92
Merge "MKBOOTIMG override were missing in two places"
2015-03-27 16:47:15 +00:00
Bart Sears
c3868ae371
resolved conflicts for merge of 6d607ee7
to lmp-mr1-dev-plus-aosp
...
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
2015-03-26 18:03:17 -07:00
Bart Sears
1ded630dec
am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
...
* commit '1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
2015-03-27 00:35:28 +00:00
Ying Wang
fcf0b13839
am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
2015-03-27 00:33:25 +00:00
Ying Wang
e6b9f28691
am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
...
* commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027':
Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:37:47 +00:00
Ying Wang
bc9ade722f
am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
...
* commit 'd5415dc778abffdf7a9abba52b093da7a20496be':
Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:30:42 +00:00
Ying Wang
d5415dc778
Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
2015-03-26 23:25:32 +00:00
Ying Wang
52ea2066a1
am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
...
* commit 'abc748c11cbba71a99f306d318c74b5336b28730':
Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:57:22 +00:00
Ying Wang
abc748c11c
am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
...
* commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866':
Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:50:10 +00:00
Ying Wang
a2292c94d1
Support to build image of root file system with /system and ramdisk combined.
...
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
(cherry-picked from commit 0eabd4f2c5
)
Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-26 10:35:00 -07:00
Neil Fuller
56128c5178
Addition of a CTS suite for tzdata update code
...
Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
2015-03-26 15:18:19 +00:00
Richard Uhler
c801deac20
am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
...
* commit '74b1105102ea00a30c516a06f8c5036d6ce44522':
Store odex files in oat/<isa>/ directory.
2015-03-26 15:11:26 +00:00
Richard Uhler
74b1105102
am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
...
* commit 'e7173cee108fe82b0469c456f69fe5a4160d5192':
Store odex files in oat/<isa>/ directory.
2015-03-26 15:04:43 +00:00
Richard Uhler
e7173cee10
Merge "Store odex files in oat/<isa>/ directory."
2015-03-26 14:57:33 +00:00
Jiyong Park
eb745aaf74
Fix: exit code is 0 even when check-boot-jars.py fails
...
Fix the bug that build is still success when boot jars contain
non-whitelisted classes. Now, check-boot-jars.py correctly
finishes with exit code 1 when non-whitelisted classes are found.
Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
2015-03-26 13:25:06 +09:00
Bart Sears
1c3bf5c39d
DO NOT MERGE - Bump version to 5.1.1
...
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
Stephen Hines
f68002187a
Don't warn on definition of possibly reserved identifiers.
...
Change-Id: Icfcfa94aac0503c97dee0ff4d0cd49107201526d
2015-03-25 17:28:57 -07:00
Christopher Ferris
9226f8fc3b
am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
...
* commit '07aa4c1feea3e16a99f082b71a631b20ddb8dddf':
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:58:54 +00:00
Ying Wang
335b191800
am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
...
* commit '5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3':
Switch x86 and x86_64 to 4.9. Attempt #2 .
2015-03-25 18:58:52 +00:00