Commit graph

250 commits

Author SHA1 Message Date
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
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
Narayan Kamath
35513f4c92 am d4dc88b0: Merge "Adding apache-harmony to cts."
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
  Adding apache-harmony to cts.
2014-02-17 12:30:58 +00:00
Narayan Kamath
6b83542627 am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"
* commit '92e99b128d170b28972ac3910090734e803c93e5':
  add jsr166 tests to cts. Bug: 10390711
2014-02-17 12:30:58 +00:00
Narayan Kamath
ba0b0e71ae Fix up android.core CTS tests.
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.

Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.

Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
2014-02-17 12:09:24 +00:00
Tsu Chiang Chuang
7d42d0f251 changing the rules following java package renaming for
external/apache-harmony.

(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)

Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
2014-02-17 12:09:13 +00:00
Tsu Chiang Chuang
9c648df491 Adding apache-harmony to cts.
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)

Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
2014-02-17 12:08:59 +00:00
Tsu Chiang Chuang
4e189b08f3 add jsr166 tests to cts.
Bug: 10390711

Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
2014-02-17 12:08:39 +00:00
Colin Cross
84a20ac12e am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
* commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e':
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-02-12 23:00:21 +00:00
Colin Cross
2c32144b32 resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-12 13:09:29 -08:00
Colin Cross
02e31d240a HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-02-12 12:17:55 -08:00
Ying Wang
e99fbf04dd am 9f9204ec: am a4d70f94: am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '9f9204ec3aadfe7e4b54e52f560ed7c66f316891':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:09:10 +00:00
Ying Wang
a4d70f9435 am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '0105f1cc9aa2ea3c683c197b18747f5b04310c27':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
2014-01-27 23:01:02 +00:00
Andrew Boie
f3ec9ed045 collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.

Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-01-27 12:25:43 -08:00
Narayan Kamath
13a3fe86c9 Fix up android.core CTS tests.
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.

Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.

Change-Id: Iff1978b2654485bfea0fc17221c6e1f62c31b913
2013-12-31 16:08:47 +00:00
Woody Lin
be4de2e493 am d2435bde: am dcefbfde: Add htc\' to _vendor_owner_whitelist\'
* commit 'd2435bded54a3207b1951190e22d422010684dc9':
  Add `htc' to `_vendor_owner_whitelist'
2013-12-19 23:34:40 +00:00
Woody Lin
dcefbfde3f Add htc' to _vendor_owner_whitelist'
Change-Id: I92bfc8d41d102f687fd8a5b632be3c01c2d005fd
Signed-off-by: Woody Lin <woody_lin@htc.com>
2013-12-19 15:08:35 -08:00
Tsu Chiang Chuang
788878444c changing the rules following java package renaming for
external/apache-harmony.

(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)

Change-Id: I423c6c11f253239faae89e5319ff40fc15b943a6
2013-11-14 16:22:33 -08:00
Tsu Chiang Chuang
6b874c9df3 Adding apache-harmony to cts.
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)

Change-Id: I09fe17f1675aa16a8e325384a7f6d042b07fe02d
2013-11-14 16:22:32 -08:00
Colin Cross
a79af6ae89 am 8c6a66e9: am 36e95f31: Merge "don\'t check paths of non-installed or host modules" into klp-dev
* commit '8c6a66e959ab3c333214d35927b719498086bf6c':
  don't check paths of non-installed or host modules
2013-10-03 16:43:06 -07:00
Colin Cross
8c6a66e959 am 36e95f31: Merge "don\'t check paths of non-installed or host modules" into klp-dev
* commit '36e95f316f660f3cf32dbd47bbafba0e2ee56ad9':
  don't check paths of non-installed or host modules
2013-10-03 15:38:36 -07:00
Colin Cross
86b0dfb2d0 don't check paths of non-installed or host modules
Static libraries and host modules are not installed under
TARGET_OUT_VENDOR and don't need to be, relax the checks.

Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
2013-10-02 15:33:05 -07:00
Dan Willemsen
93ec84d57f am b8858941: am f47d5802: Don\'t check vendor path for phony packages
* commit 'b885894123aa93250238f2437f3f70b25c9d1872':
  Don't check vendor path for phony packages
2013-09-24 10:46:52 -07:00
Dan Willemsen
b885894123 am f47d5802: Don\'t check vendor path for phony packages
* commit 'f47d5802e627bf14cecc425b8c3e00e001c0f7c2':
  Don't check vendor path for phony packages
2013-09-24 10:43:54 -07:00
Dan Willemsen
f47d5802e6 Don't check vendor path for phony packages
These don't get installed, so they don't need to be in TARGET_OUT_VENDOR

Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32
2013-09-24 10:30:35 -07:00