Commit graph

329 commits

Author SHA1 Message Date
Narayan Kamath
436d0c1117 Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.

(cherry picked from commit b3c9e4a22e)

Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski
052a00f64e Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit 89b94c827f)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Ying Wang
5d88770f26 Don't run ziptime on host zip files.
ziptime fails on zip file larger than 2GB.
These zip files won't installed on device and we don't care that much
about their reprodudcibility across builds.

Change-Id: I47062928d075a59eda92dd5333e59502f490d1cb
2015-11-04 10:06:25 -08:00
Dan Willemsen
48a621c277 Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new tool, ziptime, that uses a very stripped down copy of
zipalign. It no longer depends on libandroidfw, and now rewrites the
timestamps in place instead of making a copy of the zipfile. This should
improve speed and reduce disk requirements, especially with the large
packaging zip files.

Bug: 24201956
Change-Id: I50f68669f659da1b4393e964ad40b6aafb00c1e7
2015-11-02 14:51:54 -08:00
Ying Wang
67132baa4d Fix "make product-graph" and "make dump-products".
- For unmodified "make product-graph" and "make dump-products",
  load only the current product configuration makefiles. This is much
  faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
  "make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
  makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
  the Android.mks, which takes long and we don't really need them.
  More importantly, with all product makefiles loaded, modules in
  Android.mks are prone to clash (if they are conditionally included
  by variables set up in product makefiles) and lead to parse-time
  error.

Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
2015-10-28 16:49:44 -07:00
Thierry Strudel
6b74f21a4d oem_image/custom_image: fix missing new parameter to build_image.py
Bug: 22441494
Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-13 14:46:49 -07:00
leozwang
92eb5703e5 Add BUILD NUMBER into oem image.
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
2015-06-20 21:05:19 -07: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
Patrick Tjin
899717ff2a Add huawei to vendor owner whitelist [DO NOT MERGE]
Change-Id: I4996eeb43e414f327e6e9b52564044771bfbc1c3
(cherry picked from commit 7f6fb274b7)
2015-05-27 03:31:38 +00:00
Ying Wang
69425c1dcb am 44acba6d: am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '44acba6d37b1d13ef3a3ec6d89e5121f691089d9':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:15:47 +00:00
Ying Wang
44acba6d37 am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '02026edf4d104750fde070862636d29db4124b3a':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:03:22 +00:00
Ying Wang
247f5c4fce am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:28:37 +00:00
Ying Wang
a1ea202256 Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
  $ make deps-license packages/app/% external/%
  prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".

Bug: 20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from 39b9b690a8)
2015-05-19 16:37:42 -07:00
dcashman
49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

(cherry-pick of commit: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
Ying Wang
b4b767a484 Fix Mac build.
Mac doesn't like "cp -r -L", but "cp -R -L".

Change-Id: I32bd8e5171db4ed811e158d91482671b14622825
2015-05-07 20:57:56 -07:00
Ying Wang
069f1f8942 Deference symlinks when copying LOCAL_PICKUP_FILES.
Change-Id: I2399529ee9168bb93a4cad5daa61cd2ea500df04
2015-04-30 19:46:00 -07:00
dcashman
9d50b548cd resolved conflicts for merge of b9e4848e to master
Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
2015-04-22 14:49:23 -07:00
dcashman
0ae8bf67af am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution."
* commit '780bdd6a1363cfe2fb9425647e0458dd2aee43f4':
  Add lib dirs to cts distribution.
2015-04-22 18:55:13 +00:00
dcashman
17412c8305 Add lib dirs to cts distribution.
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.

Bug: 19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
2015-04-21 17:53:21 -07: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
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
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
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
3cc6a0f22f Merge "Addition of a CTS suite for tzdata update code" 2015-03-31 08:30:51 +00:00
Ying Wang
ac1da77e65 am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit 'e6b9f2869110a35316022c639bf3d932034783d3':
  Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:51:07 +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
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
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
Ying Wang
c85af62429 am 743b9f49: am ad54a4da: Add selinux and verity support to custom image generation.
* commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
  Add selinux and verity support to custom image generation.
2015-03-23 18:02:30 +00:00
Ying Wang
ad54a4dab5 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-03-23 17:50:16 +00:00
Ying Wang
7d51a40295 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
2015-03-23 10:04:56 -07:00
Ying Wang
d4ca3b38d9 am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
  Support to configure and build multiple custom images.
2015-03-14 00:31:44 +00:00
Ying Wang
ae61f50a68 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-03-14 00:06:54 +00:00
Ying Wang
5fcf1094f9 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
2015-03-13 16:48:02 -07:00
Tsu Chiang Chuang
557bada052 add additional optional args to building CTS.
Change-Id: Ie99d1be7fbdef96545f4c9b4e3865ea08285b73f
2015-02-19 17:29:11 -08:00
Stuart Scott
5139ce4916 Split the build of the CTS infrastructure from the tests.
This allows developers to build the test packages individually without
needing to build the entire CTS release.

bug: 18945639
Change-Id: Iedc162059617f683a16a6b80cb7b1a6e0674bba4
2015-02-11 14:12:14 -08:00
Ying Wang
3e9b20e430 am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
  Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
Ying Wang
16ba2ed82b resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang
14cc23d433 Remove support of factory ramdisk/bundle.
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Ying Wang
14bc97f615 am 75705338: am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
* commit '75705338b7e8e1353503b53f10274fda5c3cf7bf':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:42:49 +00:00
Ying Wang
75705338b7 am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
* commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:06:17 +00:00
Ying Wang
cb73599b25 Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.

Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
2015-01-27 15:49:21 -08:00
Ying Wang
9cfaba309f am febc6b56: am f495c125: am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit 'febc6b567a909134bdc84a8e6e8c2681a07ca59b':
  Let apicheck check both the public API and system API.
2015-01-22 20:53:24 +00:00
Ying Wang
febc6b567a am f495c125: am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit 'f495c12557a0f152046122fc162d2fcfbf305a99':
  Let apicheck check both the public API and system API.
2015-01-22 20:47:14 +00:00
Alexander Levitskiy
4c5166c25d Merge "Add fpc to vendor list" 2015-01-16 02:01:58 +00:00
Ying Wang
668ae2506b Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.

Bug: 18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
2015-01-09 14:23:16 -08:00
Brian Carlstrom
25b8bb378f Remove unused PRODUCT_TAGS
Bug: 18895001
Change-Id: I2bbb1c04880218eaa06c1eff92280c636260f9ae
2015-01-05 15:33:16 -08:00
Ying Wang
9aad363e8d am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11"
* commit '7a301af1e0a3d590e42d3317940e65f739b9f930':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
2014-11-05 19:01:48 +00:00
Marcos Marado
a69822cb2b Force colorsheme to SVG, since darkblue doesn't exist on X11
Change-Id: I1b9e13dd4ca63ba27a49a55d95130bdceb187669
2014-10-27 17:41:01 +00:00