Commit Graph

23938 Commits

Author SHA1 Message Date
Claes Elgemark d0ec665727 Add missing shared libraries to dist tools
Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-04 14:31:56 +02:00
Narayan Kamath 50661cf872 am fd0cd12a: am cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit 'fd0cd12ac94ce735efad32ec3fc9cff99dce394a':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-04 11:26:44 +00:00
Narayan Kamath fd0cd12ac9 am cf7fbcd0: Remove duplicate CTS tests from libcore cts packages.
* commit 'cf7fbcd03d9f13d1c2fe6e65f02247feadec136d':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-04 11:14:40 +00:00
Narayan Kamath cf7fbcd03d 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
2015-06-04 10:50:52 +00:00
Paul Crowley 54a28654e6 Build "secdiscard" for securely discarding data from flash devices.
Bug: 19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
2015-06-04 09:59:33 +01:00
Tao Bao 83b52f1f1a am b7998ec0: am 726b7f33: Fix the broken signing script
* commit 'b7998ec0d58a38c587b2a070c45f7eb73b22c298':
  Fix the broken signing script
2015-06-04 01:47:05 +00:00
Tao Bao b7998ec0d5 am 726b7f33: Fix the broken signing script
* commit '726b7f338f32ca6d18e9961b0a2da3ef385f7e34':
  Fix the broken signing script
2015-06-04 01:34:06 +00:00
Tao Bao 726b7f338f 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
2015-06-03 17:36:12 -07:00
Ying Wang b6a96a7698 Merge "Add support for LOCAL_COMPATIBILITY_SUITE" 2015-06-04 00:22:26 +00:00
Ying Wang 1624361d84 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
2015-06-03 16:21:12 -07:00
Yorke Lee bc4e48ff39 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
2015-06-03 22:27:03 +00:00
Mark Salyzyn cbd4bcdb6b am c0ba46d9: am 9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te
* commit 'c0ba46d92e0480e88c14cb859e3d2628ad6bd748':
  goldfish: rename goldfish_logcat.te to logd.te
2015-06-03 22:23:37 +00:00
Nick Kralevich d876a80478 am 3125b3e9: resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp
* commit '3125b3e97334eb5dcd6c0981f3dd0a6ab49e44e2':
  goldfish: logcat -Q in logd domain
2015-06-03 22:23:36 +00:00
Yorke Lee 24deb5d08f am 05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '05f9da8e6f778c44031b957ccd2f91bde83baa6e':
  Add 'adb shell telecom' command to packages list
2015-06-03 21:59:47 +00:00
Yorke Lee 05f9da8e6f Merge "Add 'adb shell telecom' command to packages list" into mnc-dev 2015-06-03 21:39:39 +00:00
Yorke Lee a1e1d9cea5 Add 'adb shell telecom' command to packages list
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
2015-06-03 13:57:33 -07:00
Ying Wang 8323b36599 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.
2015-06-03 19:23:25 +00:00
Ying Wang 7f16062e23 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.
2015-06-03 19:23:24 +00:00
Mark Salyzyn 01c89fe16a 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
2015-06-03 19:23:23 +00:00
Ying Wang cc7cbea11b am 9e8899c7: am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '9e8899c75e82d50024de3f6e50d85f842479a4ab':
  Add VeritySigner.jar to ota tools
2015-06-03 19:23:22 +00:00
Tao Bao 6a581fd6ce am 7cebca42: am 1ef34d34: am 54310d1a: Merge "Fix the wrong error message"
* commit '7cebca42e3de100a17719c4a8ec013da10d4071f':
  Fix the wrong error message
2015-06-03 19:23:21 +00:00
Mark Salyzyn a695ef81c5 am 86997b88: am defa1737: am b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '86997b880910bef39756371f5d6f78e32c7dc99a':
  goldfish: logcat -Q in logd domain
2015-06-03 19:22:26 +00:00
Mark Salyzyn c0ba46d92e am 9f8e1e1c: goldfish: rename goldfish_logcat.te to logd.te
* commit '9f8e1e1c7dc022600477d151e1d0341c16528012':
  goldfish: rename goldfish_logcat.te to logd.te
2015-06-03 19:17:50 +00:00
Nick Kralevich 3125b3e973 resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp
Bug: 19608716
Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737
2015-06-03 11:55:39 -07:00
Ying Wang 25d9cff48a 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.
2015-06-03 18:36:24 +00:00
Ying Wang 12686ae232 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.
2015-06-03 18:36:23 +00:00
Mark Salyzyn 31f116de07 am 70749857: am 9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '70749857595a100bf9e8f009767030812101d365':
  goldfish: rename goldfish_logcat.te to logd.te
2015-06-03 18:36:22 +00:00
Ying Wang 9e8899c75e am 3bb1bea9: am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '3bb1bea968f4cc3754cacad1ec41ac01cc6cf259':
  Add VeritySigner.jar to ota tools
2015-06-03 18:36:20 +00:00
Tao Bao 7cebca42e3 am 1ef34d34: am 54310d1a: Merge "Fix the wrong error message"
* commit '1ef34d3440db524d6ea2e0a6d4e72b668765d293':
  Fix the wrong error message
2015-06-03 18:36:17 +00:00
Luan Nguyen 30b16ac6a4 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
2015-06-03 18:25:23 +00:00
Luan Nguyen 95a1818f50 Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 2015-06-03 18:13:17 +00:00
Mark Salyzyn 9f8e1e1c7d goldfish: rename goldfish_logcat.te to logd.te
(cherrypicked from commit fd8c30177c)

Bug: 19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
2015-06-03 10:48:35 -07:00
Mark Salyzyn 94871b94ef goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105

(cherrypicked from commit 1cc7735ffa)

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
2015-06-03 10:47:34 -07:00
Mark Salyzyn 86997b8809 am defa1737: am b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit 'defa1737973575e3be2dce415c68c6b13fb4fbd0':
  goldfish: logcat -Q in logd domain
2015-06-03 17:43:28 +00:00
Ying Wang 56ea339a60 am 3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '3a35aa1a2c1f3af3216875dd59a5bb21629b7c7f':
  Add selinux and verity support to custom image generation.
2015-06-03 17:11:11 +00:00
Ying Wang abffa466cc am b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit 'b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
  Support to configure and build multiple custom images.
2015-06-03 17:11:10 +00:00
Ying Wang 3a35aa1a2c Merge "Add selinux and verity support to custom image generation." 2015-06-03 16:59:03 +00:00
Ying Wang b7e6e8bb6d Merge "Support to configure and build multiple custom images." 2015-06-03 16:58:47 +00:00
Luan Nguyen 94c1826a72 docs: Add styles for embedded videos to match DevSite
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
2015-06-03 09:56:54 -07:00
Ying Wang 934d9b158e 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 7d51a40295)
2015-06-03 09:56:31 -07:00
Ying Wang 4540a85dd4 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 5fcf1094f9)
2015-06-03 09:56:29 -07:00
Mark Salyzyn 7074985759 am 9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '9ec84792b8f3faad150c68909055046b3bc272c1':
  goldfish: rename goldfish_logcat.te to logd.te
2015-06-03 16:52:50 +00:00
Ying Wang 3bb1bea968 am 9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '9fed6369b6ee4ad07a0313fa5321047be1d79b85':
  Add VeritySigner.jar to ota tools
2015-06-03 16:52:49 +00:00
Mark Salyzyn 9ec84792b8 Merge "goldfish: rename goldfish_logcat.te to logd.te" 2015-06-03 16:45:26 +00:00
Ying Wang 9fed6369b6 Merge "Add VeritySigner.jar to ota tools" 2015-06-03 16:42:18 +00:00
Claes Elgemark d53cd9b0b1 Add VeritySigner.jar to ota tools
Used by verity_signer

Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
2015-06-03 16:41:51 +00:00
Tao Bao 1ef34d3440 am 54310d1a: Merge "Fix the wrong error message"
* commit '54310d1a0dc7a3ceaaee9f4cee7b1f8b7bfbf7de':
  Fix the wrong error message
2015-06-03 16:40:08 +00:00
Tao Bao 54310d1a0d Merge "Fix the wrong error message" 2015-06-03 16:30:20 +00:00
Tao Bao e7b103751c Fix the wrong error message
apply_patch_space() checks the free space on /cache, not /system.

Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
2015-06-03 09:25:10 -07:00
Mark Salyzyn defa173797 am b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit 'b37ac46bb40e24b1014010735abc5e63802ca3bb':
  goldfish: logcat -Q in logd domain
2015-06-03 16:00:46 +00:00