Commit Graph

273 Commits

Author SHA1 Message Date
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
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
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
Brian Carlstrom
b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -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
55fa2ea206 resolved conflicts for merge of 8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
2014-06-18 19:25:30 -07:00
Ying Wang
cc033aba81 am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch."
* commit 'fe86a7c1531ac85d634b7fde16ce008ca28118fb':
  Also include the binaries for the 2nd arch.
2014-06-16 23:53:39 +00:00
Ying Wang
d0052bc70a am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"
* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
  Explicit record the modules' built-file:installed-file
2014-06-16 23:53:38 +00:00
Ying Wang
696af13a67 am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file."
* commit 'a307bbc7dcc8ce533743ba829039de1f3f979beb':
  Put modules with install path to system/ to DATA/ in the zip file.
2014-06-16 23:53:37 +00:00
Ying Wang
74c9850c79 Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-06-16 16:41:48 -07:00
Ying Wang
03270b97ca Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
2014-06-16 16:41:23 -07:00
Ying Wang
d64f3c6ee6 am c947b4a8: Also include the binaries for the 2nd arch.
* commit 'c947b4a8aec947f4dd6177e3bbd692a144b0a60c':
  Also include the binaries for the 2nd arch.
2014-06-16 23:42:56 +00:00
Ying Wang
c947b4a8ae Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:34:40 -07:00
Ying Wang
ec45d37242 Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
2014-06-16 16:42:10 -07:00
Ying Wang
01c4f4622b am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
  Fix loophole in module expansion.
2014-06-11 20:49:20 +00:00
Ying Wang
dceddd91d9 am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.
2014-06-10 22:29:18 +00:00
Ying Wang
e1b867dde7 Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
2014-06-10 14:30:30 -07:00
Vineeta Srivastava
5c80218b8e Add synaptics to vendor owner whitelist
Change-Id: Idef39568cbcc53cb50badcc8d59b7770eef10d5e
2014-06-05 22:25:56 +00:00
Neil Fuller
3ca25da84e Merge "Add the okhttp tests as a new CTS package" 2014-06-04 10:53:25 +00:00
Neil Fuller
4fdf6743d9 Add the okhttp tests as a new CTS package
Bug: 14462336
Change-Id: I74e986b2d6a25a5e4304159d214c16a51a7f7c5f
2014-05-30 13:56:32 +01:00
Rick Zhang
6eea8e25fd add moto to vendor owner whitelist
Change-Id: I63760a380a17fe096c2aff1133bba336ac8bd7f1
2014-05-28 10:31:30 -07:00
Ajay Dudani
37a4b4ded9 Add 'qti' to vendor whitelist
Bug: 15287127
Change-Id: I4440fb0428a345edb782888fe278b8fd6d809b5d
2014-05-27 14:51:51 -07:00
Ying Wang
3380d3a1ae Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-05-19 13:03:36 -07:00
Ying Wang
92213a8ae4 Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
2014-05-15 20:45:39 -07:00
Ying Wang
af3f1a5454 am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:10:43 +00:00
Ying Wang
1ba08f6b7c am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."
* commit '2d41656cdb41853e42a7ea2c0597ce505ef51750':
  Add tool to package up built modules.
2014-05-09 00:10:43 +00:00
Ying Wang
07b2055d3e Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang
989ac38d93 Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
  You can use this template to package up modules into a zip file and
  preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
  files/directories.

Bug: 13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
2014-05-08 17:01:06 -07:00
Ying Wang
571fee8985 Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 14:52:39 -07:00
Ying Wang
3b81aabbd0 Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
  You can use this template to package up modules into a zip file and
  preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
  files/directories.

Bug: 13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
2014-05-05 16:46:52 -07:00
Ying Wang
b8888432f0 Set up rules to build oem.img
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
  built.

Bug: 13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
2014-04-28 09:43:51 -07:00
Ying Wang
923f21d903 am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit 'ff78e6523189dd179a95309cb9630dab2d9f098d':
  Add intel to the vendor whitelist
2014-04-01 03:10:25 +00:00
Ying Wang
ff78e65231 am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '9cfefe13aeb3295605ea47040767261df95d2cda':
  Add intel to the vendor whitelist
2014-04-01 03:05:06 +00:00
Daniel Leung
625974cf2a Add intel to the vendor whitelist
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
2014-04-01 10:38:12 +08:00
Hui Shu
f6a9b877b5 Fix the build break.
BUG: b/11293324
Should find the removed.txt under frameworks/base/api/

Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e
2014-03-13 15:40:55 -07:00
Hui Shu
749aee5f5e Merge "Add removed.txt for doclava api consistency check" 2014-03-13 22:11:23 +00:00
Hui Shu
e8af17eb27 Add removed.txt for doclava api consistency check
BUG: b/11293324
Change-Id: Ie7cda9bc7d3a1e6c433eb073cc878b149cead8a0
2014-02-21 17:59:45 -08:00
Narayan Kamath
0003192c32 am 2bea94ba: Merge "Fix up android.core CTS tests."
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
  Fix up android.core CTS tests.
2014-02-17 12:31:00 +00:00
Narayan Kamath
2a1a308f3b am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
  changing the rules following java package renaming for external/apache-harmony.
2014-02-17 12:30:59 +00:00