OSDN Git Service
Baligh Uddin [Tue, 9 Jun 2015 23:40:58 +0000 (23:40 +0000)]
am
d80f0868: am
942a42e3: Merge "Allow custom boot_signer and verity_signer." into mnc-dev
* commit '
d80f08688c6d46ad24d2465acd11a840e45fdc5d':
Allow custom boot_signer and verity_signer.
Baligh Uddin [Tue, 9 Jun 2015 23:28:07 +0000 (23:28 +0000)]
am
942a42e3: Merge "Allow custom boot_signer and verity_signer." into mnc-dev
* commit '
942a42e31de9a0468014a256ed7fdd67cb208e64':
Allow custom boot_signer and verity_signer.
Baligh Uddin [Tue, 9 Jun 2015 23:00:58 +0000 (23:00 +0000)]
Merge "Allow custom boot_signer and verity_signer." into mnc-dev
Baligh Uddin [Tue, 9 Jun 2015 22:48:14 +0000 (15:48 -0700)]
Allow custom boot_signer and verity_signer.
Bug:
21701163
Change-Id: I85e75fd3a166a9f6a7859ebf81dee73322dc2798
Claes Elgemark [Tue, 9 Jun 2015 17:12:32 +0000 (17:12 +0000)]
am
f49cd4b4: am
b5cd1f03: Add missing shared libraries to dist tools
* commit '
f49cd4b44992f0274e97150755cc70acd2dc2f27':
Add missing shared libraries to dist tools
Ying Wang [Tue, 9 Jun 2015 17:02:58 +0000 (17:02 +0000)]
am
616f5707: am
740dee5a: am
1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '
616f5707a336a83ea490c43bbee935c4c39f3b69':
Add build_verity_metadata.py to dist-tools
Claes Elgemark [Tue, 9 Jun 2015 17:02:47 +0000 (17:02 +0000)]
am
b5cd1f03: Add missing shared libraries to dist tools
* commit '
b5cd1f03c2e722112526b4abdd9b3299364c7788':
Add missing shared libraries to dist tools
Ying Wang [Tue, 9 Jun 2015 16:41:29 +0000 (16:41 +0000)]
am
740dee5a: am
1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '
740dee5a5626724051883b6f9c9a7df511b65b29':
Add build_verity_metadata.py to dist-tools
Ying Wang [Tue, 9 Jun 2015 16:32:52 +0000 (16:32 +0000)]
am
1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '
1b96592aab7a8e3d357a4e09f685968edcfe05b9':
Add build_verity_metadata.py to dist-tools
Ying Wang [Tue, 9 Jun 2015 16:20:49 +0000 (16:20 +0000)]
Merge "Add build_verity_metadata.py to dist-tools"
Claes Elgemark [Wed, 3 Jun 2015 06:35:52 +0000 (08:35 +0200)]
Add missing shared libraries to dist tools
(cherry pick from
d0ec6657273f97c8defa94a44bac31f3f77f57bd)
Add missing libraries used by e2fsck and build_verity_tree.
Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
Narayan Kamath [Tue, 9 Jun 2015 10:35:28 +0000 (10:35 +0000)]
am
ff321c91: am
4cdb0d34: am
7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '
ff321c91613e68f9c3a6a588b4ae93d1f7a82111':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Tue, 9 Jun 2015 10:23:07 +0000 (10:23 +0000)]
am
4cdb0d34: am
7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '
4cdb0d34395bef9828e38fca6281603dd784de84':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Tue, 9 Jun 2015 10:12:12 +0000 (10:12 +0000)]
am
7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '
7d2c71cf90cc8da55c8b8faad5910267c23ae542':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Tue, 9 Jun 2015 10:03:16 +0000 (10:03 +0000)]
Merge "Remove duplicate CTS tests from libcore cts packages."
Narayan Kamath [Mon, 1 Jun 2015 13:45:55 +0000 (14:45 +0100)]
Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.
Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.
bug:
20862863
(cherry picked from commit
cf7fbcd03d9f13d1c2fe6e65f02247feadec136d)
Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8
Mark Salyzyn [Tue, 9 Jun 2015 00:28:14 +0000 (00:28 +0000)]
am
6d697519: am
5ced4018: am
911637bf: Merge "Add missing shared libraries to dist tools"
* commit '
6d69751916fd2d41196caf780daf65a701cb715a':
Add missing shared libraries to dist tools
Mark Salyzyn [Tue, 9 Jun 2015 00:15:53 +0000 (00:15 +0000)]
am
5ced4018: am
911637bf: Merge "Add missing shared libraries to dist tools"
* commit '
5ced401874da219d66077f7a85c939594624ae0c':
Add missing shared libraries to dist tools
Ying Wang [Tue, 9 Jun 2015 00:15:15 +0000 (00:15 +0000)]
am
bae01ccd: am
18e98163: am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
bae01ccd975b8a5e2adc4783b1bf330140362bde':
Strip path from verity_signer_cmd in the target-files meta data.
Ying Wang [Tue, 9 Jun 2015 00:01:03 +0000 (00:01 +0000)]
am
18e98163: am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
18e981638d77af502a42895fbb37bc80e3642283':
Strip path from verity_signer_cmd in the target-files meta data.
Mark Salyzyn [Tue, 9 Jun 2015 00:00:37 +0000 (00:00 +0000)]
am
911637bf: Merge "Add missing shared libraries to dist tools"
* commit '
911637bf33b2f8994fc93eb8ea6e4a8428122e13':
Add missing shared libraries to dist tools
Mark Salyzyn [Mon, 8 Jun 2015 23:51:32 +0000 (23:51 +0000)]
Merge "Add missing shared libraries to dist tools"
Ying Wang [Mon, 8 Jun 2015 23:48:24 +0000 (23:48 +0000)]
am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
8e42131ba2aa4fd12395e2c122ab62c9991e6f72':
Strip path from verity_signer_cmd in the target-files meta data.
Ying Wang [Mon, 8 Jun 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Strip path from verity_signer_cmd in the target-files meta data."
Stuart Scott [Mon, 8 Jun 2015 23:24:03 +0000 (23:24 +0000)]
Merge "Only copy tools, not test artifacts"
Stuart Scott [Mon, 8 Jun 2015 22:04:31 +0000 (15:04 -0700)]
Only copy tools, not test artifacts
Change-Id: I723f580a6cea783dc07d12883dfe36120e462784
Omari Stephens [Mon, 8 Jun 2015 23:10:01 +0000 (23:10 +0000)]
Merge "Add the ability to display annotations in the generated docs"
Ying Wang [Mon, 8 Jun 2015 20:21:12 +0000 (20:21 +0000)]
am
bc0f1f56: am
ac3f88d8: am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
bc0f1f565143a676dfdb5e2234c94e7da3116a0f':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 20:08:09 +0000 (20:08 +0000)]
am
ac3f88d8: am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 19:15:13 +0000 (19:15 +0000)]
am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
080f57aed7ac0f03c5db216dafe5023b032525ed':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 19:00:59 +0000 (19:00 +0000)]
Merge "Remove the unnecessary full_x86_64 and full_mips64."
Ying Wang [Mon, 8 Jun 2015 18:57:26 +0000 (11:57 -0700)]
Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.
Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
Omari Stephens [Sat, 6 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Add the ability to display annotations in the generated docs
Bug:
8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Stuart Scott [Fri, 5 Jun 2015 14:59:26 +0000 (14:59 +0000)]
Merge "Adds the compatibility build task and cts_v2 rules."
Claes Elgemark [Thu, 4 Jun 2015 08:07:44 +0000 (10:07 +0200)]
Add build_verity_metadata.py to dist-tools
Preserve path as it is referenced by build_image.py.
Change-Id: Id6833d243b5a15b4ee5e0013340aeb2cd35f3578
Luan Nguyen [Fri, 5 Jun 2015 03:01:10 +0000 (03:01 +0000)]
am
c4c51746: am
18985e76: am
30b16ac6: am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
c4c51746cb5f1965b5174bf56f2b4f8c8f59b646':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Fri, 5 Jun 2015 02:50:18 +0000 (02:50 +0000)]
am
18985e76: am
30b16ac6: am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
18985e76617fefab2d9bf480c99994e1e9ba9143':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Fri, 5 Jun 2015 02:27:29 +0000 (02:27 +0000)]
am
30b16ac6: am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
30b16ac6a4d4658d927d48476081de7542b5989f':
docs: Add styles for embedded videos to match DevSite
Stuart Scott [Thu, 4 Jun 2015 00:42:39 +0000 (17:42 -0700)]
Adds the compatibility build task and cts_v2 rules.
Change-Id: If7939dba38566f26cbc678da3fe7cb605c19745a
Dimitry Ivanov [Thu, 4 Jun 2015 20:33:25 +0000 (20:33 +0000)]
am
9c836723: am
72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '
9c836723b784a344442d4646fc849470b8fcd515':
Uncompress .so files before signing the apk.
Don't extract jni from prebuilt apks.
Dimitry Ivanov [Thu, 4 Jun 2015 20:19:49 +0000 (20:19 +0000)]
am
72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '
72bced8a758a3a8427768d97e6d763f6a706d2b1':
Uncompress .so files before signing the apk.
Don't extract jni from prebuilt apks.
Dimitry Ivanov [Thu, 4 Jun 2015 18:32:06 +0000 (18:32 +0000)]
Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
Uncompress .so files before signing the apk.
Don't extract jni from prebuilt apks.
Ying Wang [Thu, 4 Jun 2015 18:21:49 +0000 (11:21 -0700)]
Make AndroidTest.xml optional.
Make AndroidTest.xml optional for compatibility suite module.
Change-Id: I6622e17191fa67b33c577056681b989516f3a3a8
Claes Elgemark [Wed, 3 Jun 2015 06:35:52 +0000 (08:35 +0200)]
Add missing shared libraries to dist tools
Add missing libraries used by e2fsck and build_verity_tree.
Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
Narayan Kamath [Thu, 4 Jun 2015 11:26:44 +0000 (11:26 +0000)]
am
fd0cd12a: am
cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit '
fd0cd12ac94ce735efad32ec3fc9cff99dce394a':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Thu, 4 Jun 2015 11:14:40 +0000 (11:14 +0000)]
am
cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit '
cf7fbcd03d9f13d1c2fe6e65f02247feadec136d':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Mon, 1 Jun 2015 13:45:55 +0000 (14:45 +0100)]
Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.
Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.
bug:
20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
Tao Bao [Thu, 4 Jun 2015 01:47:05 +0000 (01:47 +0000)]
am
b7998ec0: am
726b7f33: Fix the broken signing script
* commit '
b7998ec0d58a38c587b2a070c45f7eb73b22c298':
Fix the broken signing script
Tao Bao [Thu, 4 Jun 2015 01:34:06 +0000 (01:34 +0000)]
am
726b7f33: Fix the broken signing script
* commit '
726b7f338f32ca6d18e9961b0a2da3ef385f7e34':
Fix the broken signing script
Tao Bao [Thu, 4 Jun 2015 00:31:34 +0000 (17:31 -0700)]
Fix the broken signing script
check_target_files_signatures.py was accidentally broken due to the
renaming of a variable in last commit. It escaped the checking from
pylint because it was a keyword ('all').
Bug:
21611858
Change-Id: I58c983e59c4a3e0018481d3c9ba328ed76f5c08a
Ying Wang [Thu, 4 Jun 2015 00:22:26 +0000 (00:22 +0000)]
Merge "Add support for LOCAL_COMPATIBILITY_SUITE"
Ying Wang [Wed, 3 Jun 2015 19:43:50 +0000 (12:43 -0700)]
Add support for LOCAL_COMPATIBILITY_SUITE
A module can specify itself to be a Compatibility Suite module with:
LOCAL_COMPATIBILITY_SUITE := <cts-name>
<cts-name> can be "cts" or any other cts name supported by the
build system.
The cts name's config.mk must define global variable
COMPATIBILITY_TESTCASES_OUT_<cts-name> to point to the testcase
output directory.
This change copies the module's built file, as well as the module's
AndroidTest.xml, to the testcase output directory.
The build system collects all the testcase files in a global variable
COMPATIBILITY.<cts-name>.FILES, which you can reference in a build
task that builds the suite's zip package.
Also copy over the test case files if user runs mm/mmm/etc.
Change-Id: Ica0dbc4f193db7de7d395b9c686733bdac41f566
Yorke Lee [Wed, 3 Jun 2015 22:27:03 +0000 (22:27 +0000)]
am
24deb5d0: am
05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '
24deb5d08f7e258af3e48afc3068be9786462a3d':
Add 'adb shell telecom' command to packages list
Mark Salyzyn [Wed, 3 Jun 2015 22:23:37 +0000 (22:23 +0000)]
am
c0ba46d9: am
9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te
* commit '
c0ba46d92e0480e88c14cb859e3d2628ad6bd748':
goldfish: rename goldfish_logcat.te to logd.te
Nick Kralevich [Wed, 3 Jun 2015 22:23:36 +0000 (22:23 +0000)]
am
3125b3e9: resolved conflicts for merge of
94871b94 to mnc-dev-plus-aosp
* commit '
3125b3e97334eb5dcd6c0981f3dd0a6ab49e44e2':
goldfish: logcat -Q in logd domain
Yorke Lee [Wed, 3 Jun 2015 21:59:47 +0000 (21:59 +0000)]
am
05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '
05f9da8e6f778c44031b957ccd2f91bde83baa6e':
Add 'adb shell telecom' command to packages list
Yorke Lee [Wed, 3 Jun 2015 21:39:39 +0000 (21:39 +0000)]
Merge "Add 'adb shell telecom' command to packages list" into mnc-dev
Yorke Lee [Wed, 3 Jun 2015 20:57:33 +0000 (13:57 -0700)]
Add 'adb shell telecom' command to packages list
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
Ying Wang [Wed, 3 Jun 2015 19:23:25 +0000 (19:23 +0000)]
am
25d9cff4: am
56ea339a: am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
25d9cff48a56c00335d220a87987cc8b39fd2935':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 19:23:24 +0000 (19:23 +0000)]
am
12686ae2: am
abffa466: (-s ours) am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
12686ae232234e41589c8ad8bed031ba079881f9':
Support to configure and build multiple custom images.
Mark Salyzyn [Wed, 3 Jun 2015 19:23:23 +0000 (19:23 +0000)]
am
31f116de: am
70749857: am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
31f116de07d0a6023558a4c4aa8e44b3f73fc4f8':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 19:23:22 +0000 (19:23 +0000)]
am
9e8899c7: am
3bb1bea9: am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
9e8899c75e82d50024de3f6e50d85f842479a4ab':
Add VeritySigner.jar to ota tools
Tao Bao [Wed, 3 Jun 2015 19:23:21 +0000 (19:23 +0000)]
am
7cebca42: am
1ef34d34: am
54310d1a: Merge "Fix the wrong error message"
* commit '
7cebca42e3de100a17719c4a8ec013da10d4071f':
Fix the wrong error message
Mark Salyzyn [Wed, 3 Jun 2015 19:22:26 +0000 (19:22 +0000)]
am
86997b88: am
defa1737: am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
86997b880910bef39756371f5d6f78e32c7dc99a':
goldfish: logcat -Q in logd domain
Mark Salyzyn [Wed, 3 Jun 2015 19:17:50 +0000 (19:17 +0000)]
am
9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te
* commit '
9f8e1e1c7dc022600477d151e1d0341c16528012':
goldfish: rename goldfish_logcat.te to logd.te
Nick Kralevich [Wed, 3 Jun 2015 18:54:49 +0000 (11:54 -0700)]
resolved conflicts for merge of
94871b94 to mnc-dev-plus-aosp
Bug:
19608716
Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737
Ying Wang [Wed, 3 Jun 2015 18:36:24 +0000 (18:36 +0000)]
am
56ea339a: am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
56ea339a6008b81f885274a6446c68dc240dafe7':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 18:36:23 +0000 (18:36 +0000)]
am
abffa466: (-s ours) am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
abffa466cc4469d389da3c22ee929cd6f216887d':
Support to configure and build multiple custom images.
Mark Salyzyn [Wed, 3 Jun 2015 18:36:22 +0000 (18:36 +0000)]
am
70749857: am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
70749857595a100bf9e8f009767030812101d365':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 18:36:20 +0000 (18:36 +0000)]
am
3bb1bea9: am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
Add VeritySigner.jar to ota tools
Tao Bao [Wed, 3 Jun 2015 18:36:17 +0000 (18:36 +0000)]
am
1ef34d34: am
54310d1a: Merge "Fix the wrong error message"
* commit '
1ef34d3440db524d6ea2e0a6d4e72b668765d293':
Fix the wrong error message
Luan Nguyen [Wed, 3 Jun 2015 18:25:23 +0000 (18:25 +0000)]
am
95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '
95a1818f50c685f903635ae84076199015cc9c78':
docs: Add styles for embedded videos to match DevSite
Luan Nguyen [Wed, 3 Jun 2015 18:13:16 +0000 (18:13 +0000)]
Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
(cherrypicked from commit
fd8c30177c472fe1cbff30312144b2a0b231bd35)
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
Mark Salyzyn [Wed, 3 Jun 2015 14:50:31 +0000 (07:50 -0700)]
goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105
(cherrypicked from commit
1cc7735ffa5194b9651429b2a96d6f6f319ca5eb)
Bug:
19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
Mark Salyzyn [Wed, 3 Jun 2015 17:43:28 +0000 (17:43 +0000)]
am
defa1737: am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
defa1737973575e3be2dce415c68c6b13fb4fbd0':
goldfish: logcat -Q in logd domain
Ying Wang [Wed, 3 Jun 2015 17:11:11 +0000 (17:11 +0000)]
am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
3a35aa1a2c1f3af3216875dd59a5bb21629b7c7f':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)]
am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
Support to configure and build multiple custom images.
Ying Wang [Wed, 3 Jun 2015 16:59:01 +0000 (16:59 +0000)]
Merge "Add selinux and verity support to custom image generation."
Ying Wang [Wed, 3 Jun 2015 16:58:46 +0000 (16:58 +0000)]
Merge "Support to configure and build multiple custom images."
Luan Nguyen [Tue, 2 Jun 2015 19:18:54 +0000 (12:18 -0700)]
docs: Add styles for embedded videos to match DevSite
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug:
19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit
7d51a4029590b58e22071eed919d59a0ff205bef)
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug:
19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit
5fcf1094f9cf4d57c2598237f99621f254130d71)
Mark Salyzyn [Wed, 3 Jun 2015 16:52:50 +0000 (16:52 +0000)]
am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
9ec84792b8f3faad150c68909055046b3bc272c1':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 16:52:49 +0000 (16:52 +0000)]
am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
9fed6369b6ee4ad07a0313fa5321047be1d79b85':
Add VeritySigner.jar to ota tools
Mark Salyzyn [Wed, 3 Jun 2015 16:45:26 +0000 (16:45 +0000)]
Merge "goldfish: rename goldfish_logcat.te to logd.te"
Ying Wang [Wed, 3 Jun 2015 16:42:17 +0000 (16:42 +0000)]
Merge "Add VeritySigner.jar to ota tools"
Claes Elgemark [Tue, 2 Jun 2015 09:59:32 +0000 (11:59 +0200)]
Add VeritySigner.jar to ota tools
Used by verity_signer
Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
Tao Bao [Wed, 3 Jun 2015 16:40:08 +0000 (16:40 +0000)]
am
54310d1a: Merge "Fix the wrong error message"
* commit '
54310d1a0dc7a3ceaaee9f4cee7b1f8b7bfbf7de':
Fix the wrong error message
Tao Bao [Wed, 3 Jun 2015 16:30:20 +0000 (16:30 +0000)]
Merge "Fix the wrong error message"
Tao Bao [Wed, 3 Jun 2015 16:24:08 +0000 (09:24 -0700)]
Fix the wrong error message
apply_patch_space() checks the free space on /cache, not /system.
Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
Mark Salyzyn [Wed, 3 Jun 2015 16:00:46 +0000 (16:00 +0000)]
am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
b37ac46bb40e24b1014010735abc5e63802ca3bb':
goldfish: logcat -Q in logd domain
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
Mark Salyzyn [Wed, 3 Jun 2015 15:47:18 +0000 (15:47 +0000)]
Merge "goldfish: logcat -Q in logd domain"
Mark Salyzyn [Wed, 3 Jun 2015 14:50:31 +0000 (07:50 -0700)]
goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105
Bug:
19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
Tao Bao [Tue, 2 Jun 2015 21:25:56 +0000 (21:25 +0000)]
am
26038fbb: am
60dd04ec: Merge "Add post-install verification for BBOTAs" into mnc-dev
* commit '
26038fbb2c4f7a23921f2f7e04022349238bd710':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 21:09:12 +0000 (21:09 +0000)]
am
60dd04ec: Merge "Add post-install verification for BBOTAs" into mnc-dev
* commit '
60dd04ecfc94bd732c72287349f2fb910a0bbbef':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 20:33:18 +0000 (20:33 +0000)]
am
87742421: am
2e30a5e8: am
708c4623: Merge "Add post-install verification for BBOTAs"
* commit '
87742421b2b73fde8941fba12252b7b4970abf9b':
Add post-install verification for BBOTAs
Yohann Roussel [Tue, 2 Jun 2015 20:31:32 +0000 (20:31 +0000)]
am
16ee5345: am
a9dd74c3: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
* commit '
16ee5345a8e1fc01c82f625193d0b702b8b37a42':
Add support for RMTYPEDEF with Jack