Commit graph

220 commits

Author SHA1 Message Date
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
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
Kenny Root
6dc9e43c05 resolved conflicts for merge of f913c2dd to master
Change-Id: Ie070cae60e0c78778d42fda30599df95d9532b5b
2013-09-12 09:56:31 -07:00
Kenny Root
f913c2dd77 resolved conflicts for merge of b4ada1cc to klp-dev-plus-aosp
Change-Id: Id312795c1401e00c81c9b8d0712222f2933d8fcd
2013-09-12 09:40:58 -07:00
Kenny Root
8509b0d6f9 Add Junit4 to the classpath for CollectAllTests
This is needed for CollectAllTests to work with Junit4 tests.

Change-Id: I5e339022220b8e40bcb12337a09f3615dad7d53c
2013-09-10 17:00:33 -07:00
Kenny Root
5557f80660 resolved conflicts for merge of e47bf114 to master
Change-Id: I9f182c287ea067a8b2666ea4d923d04cfa618871
2013-09-05 15:54:47 -07:00
Kenny Root
69c00c9ee8 Add libcore.conscrypt tests back to CTS
A reorganization of the libcore test jar files caused the Conscrypt
tests to be accidentally dropped from CTS. Add them back in their own
package.

Bug: 10210673
Change-Id: Ia46a5de925c35115d25b7c0f974eba5b27bbfcd6
2013-09-05 15:10:44 -07:00
Tsu Chiang Chuang
d1f7501ff3 add jsr166 tests to cts.
Bug: 10390711
Change-Id: I824b915b473cbcea71e0daa30d7412cceea87130
2013-08-21 12:29:31 -07:00
Ying Wang
3670c8449a Split the product-graph build commands
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.

Change-Id: I08f278dce434050f013498327c7cbf3592512460
2013-08-01 17:45:35 -07:00
Ying Wang
6238cd9185 Demultiplex the coretests description rules
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.

Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
2013-07-10 16:58:52 -07:00
Ying Wang
51a1ae1d24 Clean up files' dependencies on phony targets.
Module names are phony targets, which make always sees as obsolete,
so a nothing-to-do build won't do nothing.
Also file target $(DEFAULT_TEST_PLAN) was never created in its rule.
Here it's fixed with a stamp file.

Bug:9761012
Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
2013-07-10 11:33:27 -07:00
Kenny Root
dfaf384309 Track change to JSSE provider
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
2013-04-29 15:58:54 -07:00
Ying Wang
8150cfcb20 am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
* commit '9592af96a7ab330b537a4d65474177805bba2ac1':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
2013-04-16 09:01:11 -07:00
Ying Wang
d6b1d61d84 Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.

Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
2013-04-15 17:41:55 -07:00
Brian Carlstrom
712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
2013-04-03 14:19:26 -07:00
jwilson
190dde0b1a Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
2013-04-02 16:24:04 -07:00
Jeff Brown
dd243370f5 apicheck: Suppress certain changes in final qualifier.
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.

Likewise it is always safe to remove final.

Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
2013-04-01 14:24:49 -07:00
Devin Kim
60b9efc060 Do not disable factory build under PDK
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk

Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
2013-03-28 14:38:11 -07:00
Kenny Root
3e3a3a2b79 am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
  CTS: work around ClassLoader limitation
2013-02-28 17:48:59 +00:00
Kenny Root
65307c065f CTS: work around ClassLoader limitation
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.

Adding them to the boot classpath forces them to be in the same
ClassLoader.

Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
Ying Wang
19cc22bc9c Move numeric api files from frameworks/base to prebuilts/sdk
So they can be used in unbundled builds.

Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
2012-12-04 15:07:34 -08:00
Ying Wang
e1f94189d9 am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
  Move check-api to definition.mk
2012-11-15 15:20:58 -08:00
Ying Wang
c065da2307 Move check-api to definition.mk
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.

Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198
2012-11-14 16:00:45 -08:00
Nick Sanders
a1712eea02 Disable factory build under PDK
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.

Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-11-02 12:55:56 -07:00
Mike Lockwood
daf5e22dba Add new embedded target for a super minimal android build
Remove obsolete BUILD_TINY_ANDROID

Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00
Ying Wang
fb03fb3ec0 Store vendor module owner info on the build server.
Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
2012-10-03 17:52:51 -07:00
Ian Rogers
76a6dc3a19 Fix common typo in comments, warning and error messages.
s/can not/cannot/g

Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
2012-10-01 16:36:23 -07:00
Ying Wang
4b0486b4a6 Allow to tag owner to PRODUCT_COPY_FILES
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
2012-09-20 16:37:55 -07:00
Ying Wang
02d75da447 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-08-21 11:54:49 -07:00
Joe Onorato
cea08a5220 resolved conflicts for merge of 5836d3b3 to jb-mr1-dev
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
2012-08-17 00:09:27 -07:00
Joe Onorato
f3319452ad More product debugging.
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:36:41 -07:00
Joe Onorato
f5debbfee6 make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:36:40 -07:00