Commit graph

307 commits

Author SHA1 Message Date
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
Stuart Scott
f06c6eff65 Add abi to generated XML
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
2014-10-15 00:10:08 +00:00
Raphael Moll
a4d1f6a7f0 SDK Addon multi-sys-img support.
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.

Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
2014-10-10 00:50:39 +00:00
Ying Wang
89ec798796 Add split apks to the cts package.
With split apk support, we may have multilple installed files for a
module. Use ALL_MODULES.$(module).BUILT_INSTALLED to make sure get
every split apk included.

Bug: 16947729
Change-Id: I4e41c2586f1b25f4810b67cd1e948aba0cbcf97b
2014-10-01 11:46:30 -07:00
Brett Chabot
cf1d2b1796 Remove cts dependency on ddmlib
Its now included in tradefed-prebuilt.

Bug: 17649015
Change-Id: I058bed467fb739a311b0645b7da6a6b72497c290
2014-09-25 12:38:36 -07:00
Ying Wang
a47420a22d Break package-modules build recipe to mutliple lines
To fix "Argument list too long" error seen on some machines.

Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
2014-09-24 10:19:14 -07:00
Ying Wang
5ae4286b94 Merge "Conditionally skip boot jars package name check." into lmp-dev 2014-09-12 01:15:56 +00:00
Ying Wang
46526ff69e Conditionally skip boot jars package name check.
In PDK build, or when a product adds its own boot jars we skip the
check.

Bug: 17434570
Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d
2014-09-11 17:40:29 -07:00
Raphael Moll
24494187de Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev 2014-09-11 22:28:40 +00:00
Ying Wang
e987400207 Check PRODUCT_BOOT_JARS against a whitelist of package names.
The whitelist is a preconfigured list of regular expressions of package
names.
Run the check as a task by default in platform build.

Bug: 17434570
Change-Id: Ieaaf7efb5f4fc7a83677f3675780ca902972be97
2014-09-10 10:51:58 -07:00
Raphael Moll
0d7d09ae04 SDK Addon multi-sys-img support, part 4.
Change the add-on build rules to packages the system-image
separately from the main add-on zip file. This is then picked
up by development's sdk_repo.mk to generate two repository
packages files (one for the add-on, one for its system image.)

The system-image now also contains a source.propertie file,
which value is not infered from the add-on's manifest.ini

Add-on product files need to be modified to define a
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP variable that points
to their source.properties or source.prop_template file.

Change-Id: I79e9cdfd43c99f099a70890fb3e5e9215ad647f4
2014-08-27 09:35:07 -07:00
Christian Bejram
d0206e481d Add fpc to vendor list
Change-Id: I530ca0b9a49453052d996413488a7b96419b0d2b
2014-08-23 21:28:31 -07:00
Bill Yi
ec4c5391f1 Add atmel to vendor owner whitelist
BUG: 16463358
2014-08-13 16:53:45 -07:00
Wally Yau
0dcc2a645b Add Mediatek and Sony to the list of vendor module owners.
Change-Id: I72942d93303760cb5484f9a6691c36ea69f0e8e5
2014-08-08 06:54:25 -07:00
Tsu Chiang Chuang
c73d200ca5 Include cts-junit target for cts tests.
(cherry picked from commit 1949a41e70)

Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
2014-07-21 22:23:18 -07:00
Ying Wang
829f68bb02 Support to check System API.
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
2014-06-26 17:54:28 -07:00
bryant_liu
5f98ff80d4 build: core: Add nxpsw for AEC function
Change-Id: I27d9bf891e5c67aef843489c2136a586ad921cb2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-24 13:11:49 -07:00
Tsu Chiang Chuang
bcf11b0b0f add jdwp tests to CTS.
Bug: 8538755

Change-Id: Ie55c0f35ff956726a4f08734c2ad4dc03862dac7
2014-06-20 12:41:48 -07:00
Neil Fuller
c61caf11a0 Fix the CTS build now that core is gone
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
2014-06-19 11:26:54 +01:00
Brian Carlstrom
b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Neil Fuller
50f0eab1cd am cc317c40: am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"
* commit 'cc317c40d3c087725e4ab9926ad83903495cd7c5':
  Fix the CTS build now that core is gone
2014-06-19 10:43:40 +00:00
Neil Fuller
cc317c40d3 am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '40f3300577d4b55926728744f1d25c08aa4e4a8b':
  Fix the CTS build now that core is gone
2014-06-19 10:39:23 +00:00
Brian Carlstrom
8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
2014-06-19 02:17:54 +00:00