Scott Main
27597c4d8e
Revert "remove renderscript support lib from javadocs"
...
... put support lib javadocs for renderscript back in.
This reverts commit 5b743677eb
.
Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
2013-09-12 18:45:05 +00:00
Kenny Root
ebf1a97a67
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.
(cherry picked from commit 69c00c9ee8
)
Bug: 10210673
Change-Id: I5ffc62736d3dab7e96e480c593e07d6c640b8950
2013-09-12 09:48:13 -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
b4ada1cc94
am 14d43108
: Merge "Add Junit4 to the classpath for CollectAllTests"
...
* commit '14d4310803ee2b9811a7adb381a2ca54b96aefe2':
Add Junit4 to the classpath for CollectAllTests
2013-09-12 09:18:39 -07:00
Kenny Root
14d4310803
Merge "Add Junit4 to the classpath for CollectAllTests"
2013-09-12 05:26:01 +00:00
Andrew Hsieh
246daf755a
resolved conflicts for merge of 2b5d2c55
to klp-dev-plus-aosp
...
Change-Id: Icd9d5eff3f9acba042c100f694309f902c9d56cf
2013-09-10 18:07:23 -07:00
Andrew Hsieh
2b5d2c55bf
am b0f41737
: Merge "Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ...""
...
* commit 'b0f4173700fc37d0765998e7c563c844ee4cbed1':
Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
2013-09-10 17:10:22 -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
Nick Kralevich
46f00b6167
am b5d4c0df
: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
...
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
Nick Kralevich
b5d4c0df50
Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
2013-09-10 20:13:18 +00:00
Nick Kralevich
0eb17d9447
Update OTA to understand SELinux labels and capabilities
...
Update the OTA generation script to understand SELinux file
labels and file capabilities.
Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.
Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.
If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.
Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
Andrew Hsieh
906cb78168
Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
...
The new option WITH_STATIC_ANALYZER=1 instructs build system to
run static analyzer via "clang --analyze" on a successful build.
If analyzer finds any issue, instruction to open report is displayed.
See http://clang-analyzer.llvm.org/scan-build.html for details.
WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist.
Project use lots of GCC extensions (eg. nested function) not supported
by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true
Change-Id: I9970560560bd52ce5f0fd7129c3488629627c735
2013-09-10 17:37:14 +08:00
Ying Wang
061b89c0bf
am 20ef354e
: Load the ONE_SHOT_MAKEFILE even in dont_bother mode
...
* commit '20ef354e8c3a1fc10515a469fcc615935e6fb7cb':
Load the ONE_SHOT_MAKEFILE even in dont_bother mode
2013-09-09 12:17:20 -07:00
Ying Wang
20ef354e8c
Load the ONE_SHOT_MAKEFILE even in dont_bother mode
...
This makes "mmm <path> snod" work again.
Note that snod has dependency on the rest of the command line goals,
which is all_modules for ONE_SHOT_MAKEFILE,
so build race condition is avoided.
Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
2013-09-09 12:13:25 -07:00
Ying Wang
b4c0656ce6
am 39e08f28
: Delete dead code.
...
* commit '39e08f2827584111f1cb2487ac7a1aae95df7ff0':
Delete dead code.
2013-09-09 11:39:19 -07:00
Ying Wang
39e08f2827
Delete dead code.
...
frameworks/policies/base/PolicyConfig.mk does no longer exist.
Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
2013-09-09 11:35:42 -07:00
Kenny Root
e47bf1149c
am 69c00c9e
: Add libcore.conscrypt tests back to CTS
...
* commit '69c00c9ee8e6f1d865db3bc61e16473bc64f7a28':
Add libcore.conscrypt tests back to CTS
2013-09-05 15:43:59 -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
Andrew Hsieh
129847526a
resolved conflicts for merge of fcdf653a
to klp-dev-plus-aosp
...
Change-Id: I1d831bbb4649b2ddc89cdfb71e3b76712bc6469e
2013-09-04 17:14:33 -07:00
Andrew Hsieh
fcdf653a17
am a62334ed
: Merge "Add "WITH_SYNTAX_CHECK=1 make ...""
...
* commit 'a62334edaf9f52dbed3264cda2247f4e5ea7de06':
Add "WITH_SYNTAX_CHECK=1 make ..."
2013-09-04 14:59:57 -07:00
Andrew Hsieh
a62334edaf
Merge "Add "WITH_SYNTAX_CHECK=1 make ...""
2013-09-04 21:57:52 +00:00
Ying Wang
1be5fb675a
am 25f39b2f
: am 62cd88d0
: Merge "FDO: Only support locally"
...
* commit '25f39b2fbe9dee8ec6c680569c22c71fce9e595c':
FDO: Only support locally
2013-09-04 11:56:03 -07:00
Ying Wang
25f39b2fbe
am 62cd88d0
: Merge "FDO: Only support locally"
...
* commit '62cd88d0d1614bbdb643f4cf4f014283b427ec7b':
FDO: Only support locally
2013-09-04 11:53:43 -07:00
Andrew Hsieh
6cea59a4b9
Add "WITH_SYNTAX_CHECK=1 make ..."
...
The new option WITH_SYNTAX_CHECK=1 instructs build system to invoke
"clang -fsyntax-only" to utilize clang's better diagnostics before calling
LOCAL_CC/LOCAL_CXX for code generation. The compilation time is slightly
longer, and the generated object file should be the same as w/o WITH_SYNTAX_CHECK
Project use lots of GCC extensions (eg. nested function) not supported
by clang may opt out by adding LOCAL_NO_SYNTAX_CHECK:=true
Change-Id: I5689586788ef049bd967364f71f31f1e359bd121
2013-09-04 09:26:25 +08:00
synergydev
7c4674205c
FDO: Only support locally
...
The issues:
- The size increase from utilizing FDO is quite large while
utilizing runtime profiles in build.
- By default, FDO is utilized globally if the target arch variant
profiles exist.
- Not all modules can show statistical significance in
performance comparison, yet still suffer the size increase.
The solution:
- Only enable FDO locally with LOCAL_FDO_SUPPORT
for modules which may benefit enough to justify the size
tradeoff.
Solution notes:
- I've noted statistical significance in libwebcore and libskia
thus far from utilizing FDO.
- Analysis included sunspider, drawcanvas benchmarks, as
well as gooda analysis on both arm and x86
- To support runtime profile generation in modules which have
LOCAL_FDO_SUPPORT specified,
BUILD_FDO_INSTRUMENTATION is still used. Otherwise,
if the target arch variant profiles exist, FDO is utilized for
specified modules.
Change-Id: I7e95266943ff47c7d82b02e6200fd09911d0bb57
2013-09-03 20:53:20 +00:00
Torne (Richard Coles)
baa01faf1d
am 4f30a507
: Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev
...
* commit '4f30a5076bea324b8224e4af4cfcf291f787ed4c':
Fix handling of .o files in LOCAL_GENERATED_SOURCES.
2013-08-30 02:42:55 -07:00
Torne (Richard Coles)
a5afbe8ac6
Fix handling of .o files in LOCAL_GENERATED_SOURCES.
...
Rule-generated .o files (in gen_o_objects) were being given a dependency
on everything in LOCAL_GENERATED_SOURCES (except for other .o files);
unfortunately this can still create cycles in cases where there are
explicit dependencies between entries in LOCAL_GENERATED_SOURCES.
Instead, make handling of generated .o files consistent with other
generated files (which don't automatically get any dependencies on other
generated files) by excluding them from the target side of the rule.
Change-Id: I3fb5652dc3d85012c179a03b81887d16a85ab3bf
2013-08-29 15:36:34 +01:00
Ying Wang
cbea143e94
am 019891c1
: am fc9cd4f5
: Create an empty zip file if no dict file found.
...
* commit '019891c1b858e571edd748e884b18d22d8efd10a':
Create an empty zip file if no dict file found.
2013-08-28 22:14:21 -07:00
Ying Wang
019891c1b8
am fc9cd4f5
: Create an empty zip file if no dict file found.
...
* commit 'fc9cd4f5c17eb51f09bb3fe14526894c7fa33ba6':
Create an empty zip file if no dict file found.
2013-08-28 22:11:44 -07:00
Ying Wang
fc9cd4f5c1
Create an empty zip file if no dict file found.
...
Instead of touch an empty file.
Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
(cherry picked from commit c62c92c3d7
)
2013-08-29 05:08:54 +00:00
Ying Wang
c97e86dca8
am c62c92c3
: Create an empty zip file if no dict file found.
...
* commit 'c62c92c3d737304cbd38e99e92f29e193b15b7c8':
Create an empty zip file if no dict file found.
2013-08-28 18:43:32 -07:00
Ying Wang
c62c92c3d7
Create an empty zip file if no dict file found.
...
Instead of touch an empty file.
Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
2013-08-28 18:38:25 -07:00
Ying Wang
54e81f546c
am 37b82aac
: Skip compiling Java if an apk has no Java code.
...
* commit '37b82aacd958ee5b820d0058a808e8f13e9b22bb':
Skip compiling Java if an apk has no Java code.
2013-08-28 17:34:24 -07:00
Ying Wang
37b82aacd9
Skip compiling Java if an apk has no Java code.
...
Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
2013-08-28 17:28:36 -07:00
Ying Wang
9915650b98
am 990cf5e5
: Better handle of need_compile_java.
...
* commit '990cf5e57d5f3e454dd60f1d532f4dabe92a1b32':
Better handle of need_compile_java.
2013-08-28 14:09:39 -07:00
Ying Wang
990cf5e57d
Better handle of need_compile_java.
...
Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
2013-08-28 14:05:20 -07:00
Ben Cheng
e3b1fc39f9
am db4113fd
: am d58df2de
: Merge "Re-tighten default compiler options."
...
* commit 'db4113fdcce77872cc4657d74ac4136b356de928':
Re-tighten default compiler options.
2013-08-28 11:32:25 -07:00
Ben Cheng
db4113fdcc
am d58df2de
: Merge "Re-tighten default compiler options."
...
* commit 'd58df2de78b798f8fc301afcfeb61f574629b8ce':
Re-tighten default compiler options.
2013-08-28 11:29:41 -07:00
Ying Wang
161aa74de6
am 576e0146
: Make it a fatal error if no source files for Java module.
...
* commit '576e0146a91f0f092cf67208c864ab9635b42222':
Make it a fatal error if no source files for Java module.
2013-08-28 11:26:37 -07:00
Ying Wang
576e0146a9
Make it a fatal error if no source files for Java module.
...
Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
2013-08-28 11:19:36 -07:00
Ben Cheng
85ccf735e2
Re-tighten default compiler options.
...
Remove "-Wno-unused-parameter -Wno-unused-but-set-parameter" added for
GCC 4.8 experiment.
BUG: 10495043
(cherry picked from internal master 1cea0755f4
)
Change-Id: Ifa221709b1351a9268c06872e2b667138995c3da
2013-08-28 11:17:43 -07:00
Jianxun Zhang
098494981d
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
...
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:
'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'
This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.
The patch fixes this issue to get:
'--para', 'val1, '--para2', 'val2 is a string'
Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
2013-08-27 15:31:13 -07:00
Ying Wang
bf05f6cc3e
am 495f6840
: In apps_only build dist a module only if it has a BUILT file.
...
* commit '495f68402493de82606b8c06213bae5bb1156a8b':
In apps_only build dist a module only if it has a BUILT file.
2013-08-27 15:07:53 -07:00
Ying Wang
495f684024
In apps_only build dist a module only if it has a BUILT file.
...
This allows you to specify a PHONY target in TARGET_BUILD_APPS.
Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
2013-08-27 15:04:57 -07:00
Ying Wang
ea0237dd89
am 10d2e0cd
: Remove the vendor-specific vars from the protected list.
...
* commit '10d2e0cd9119d25ba58d27004c18f4b894992a80':
Remove the vendor-specific vars from the protected list.
2013-08-26 15:05:47 -07:00
Ying Wang
a704583265
am 62c81f82
: Collect NOTICE files for apps_only build.
...
* commit '62c81f821f3675ea57485bfa6cb3320b7178759e':
Collect NOTICE files for apps_only build.
2013-08-26 15:04:13 -07:00
Ying Wang
8541895267
am b6cf5b2f
: am b88ca53a
: am ddce2eb0
: am de32713f
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'b6cf5b2f41d460405a0a22812255b2700a79fb20':
Collect and store proguard obfuscation dictionary files.
2013-08-26 15:01:13 -07:00
Ying Wang
b3ad11246d
am 27f2cfb7
: am 29695daa
: am 653a037d
: am 638ce57a
: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
...
* commit '27f2cfb72e932a3ccbb592ef9b75e37542ceabc4':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-26 15:00:57 -07:00
Ying Wang
10d2e0cd91
Remove the vendor-specific vars from the protected list.
...
Change-Id: I915a61034c9c3e2b886f609c4b8f4043e97bda61
2013-08-26 14:57:52 -07:00
Pavel Chupin
c1a5664ea3
Switch x86 default compiler to multilib version
...
Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler.
Tested x86 image build on Linux and Darwin.
This bionic patch is required:
https://android-review.googlesource.com/#/c/64183
Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-08-26 10:42:42 +04:00
Ying Wang
62c81f821f
Collect NOTICE files for apps_only build.
...
In apps_only build (after running tapas or exporting TARGET_BUILD_APPS),
run "make notice_files" to collect and combine the NOTICE files of
modules that are needed by the apps.
Bug: 10445634
Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
2013-08-24 13:55:59 -07:00
Ying Wang
b6cf5b2f41
am b88ca53a
: am ddce2eb0
: am de32713f
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
Collect and store proguard obfuscation dictionary files.
2013-08-23 12:19:48 -07:00
Ying Wang
b88ca53a46
am ddce2eb0
: am de32713f
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'ddce2eb007c97b8ca94bc7b3190a83006df0c187':
Collect and store proguard obfuscation dictionary files.
2013-08-23 12:18:11 -07:00
Ying Wang
ddce2eb007
am de32713f
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5':
Collect and store proguard obfuscation dictionary files.
2013-08-23 12:16:16 -07:00
Ying Wang
de32713f47
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
2013-08-23 19:14:20 +00:00
Ying Wang
ae9115a525
Collect and store proguard obfuscation dictionary files.
...
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug: 9407666
Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
2013-08-23 12:13:24 -07:00
Ying Wang
27f2cfb72e
am 29695daa
: am 653a037d
: am 638ce57a
: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
...
* commit '29695daa9734a8dfb516b7ff2e35b2b263e6b37b':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:10:20 -07:00
Ying Wang
29695daa97
am 653a037d
: am 638ce57a
: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
...
* commit '653a037d70d770d2fc03d4f205a9c626af5f5c76':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:07:45 -07:00
Ying Wang
653a037d70
am 638ce57a
: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
...
* commit '638ce57a5848c10d781502bf198a2b93aeb58a7a':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:03:47 -07:00
Ying Wang
638ce57a58
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
...
This fix proguard build.
Bug: 10307372
Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
2013-08-23 11:59:49 -07:00
Ying Wang
92ed0994d9
am c3e977ac
: am 2363485c
: am 06de9f94
: am 8709497e
: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
...
* commit 'c3e977acf150c54a73d7a4cd7f5d47474a122a66':
Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:21:06 -07:00
Ying Wang
c3e977acf1
am 2363485c
: am 06de9f94
: am 8709497e
: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
...
* commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c':
Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:17:47 -07:00
Ying Wang
7657012367
am 58ad7061
: am 93b95dc4
: am aa87a11d
: am afd7457a
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit '58ad70618d4d21f16ffe89c1e0eea7e35eae918b':
Collect and store proguard obfuscation dictionary files.
2013-08-23 10:17:36 -07:00
Ying Wang
670a7a6389
am c5b72527
: am ec3c15e5
: am 04c4d34d
: am 7311a344
: Make it easier to enable obfuscation and optimization.
...
* commit 'c5b72527d30602568dad9fd310e82b6b12fc1106':
Make it easier to enable obfuscation and optimization.
2013-08-23 10:17:35 -07:00
Ying Wang
2363485c2f
am 06de9f94
: am 8709497e
: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
...
* commit '06de9f940c34b8ade1f1866fbc1c6b32f93277b4':
Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:14:48 -07:00
Ying Wang
06de9f940c
am 8709497e
: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
...
* commit '8709497ed82800f399e99516df59afdb1bae8472':
Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:13:19 -07:00
Ying Wang
58ad70618d
am 93b95dc4
: am aa87a11d
: am afd7457a
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit '93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4':
Collect and store proguard obfuscation dictionary files.
2013-08-23 10:12:26 -07:00
Ying Wang
c5b72527d3
am ec3c15e5
: am 04c4d34d
: am 7311a344
: Make it easier to enable obfuscation and optimization.
...
* commit 'ec3c15e5c7c11cf3a831898f286c7eb7c216e50f':
Make it easier to enable obfuscation and optimization.
2013-08-23 10:12:26 -07:00
Ying Wang
8709497ed8
Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
2013-08-23 17:11:29 +00:00
Ying Wang
df8b48449a
Revert "Collect and store proguard obfuscation dictionary files."
...
This reverts commit 41dbe1e535
.
Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
2013-08-23 17:11:18 +00:00
Ying Wang
93b95dc4b9
am aa87a11d
: am afd7457a
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'aa87a11dffec0ea58c93ab0dd23b067975a4c681':
Collect and store proguard obfuscation dictionary files.
2013-08-23 10:09:28 -07:00
Ying Wang
ec3c15e5c7
am 04c4d34d
: am 7311a344
: Make it easier to enable obfuscation and optimization.
...
* commit '04c4d34d4fdb56c824abf39239d2c87806706b7e':
Make it easier to enable obfuscation and optimization.
2013-08-23 10:09:27 -07:00
Ying Wang
aa87a11dff
am afd7457a
: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
...
* commit 'afd7457adf844692b5de8f8d7eefedcc10dc7da1':
Collect and store proguard obfuscation dictionary files.
2013-08-23 10:06:59 -07:00
Ying Wang
04c4d34d4f
am 7311a344
: Make it easier to enable obfuscation and optimization.
...
* commit '7311a344bed507062e781ba70331d85652c217d8':
Make it easier to enable obfuscation and optimization.
2013-08-23 10:06:58 -07:00
Ying Wang
afd7457adf
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
2013-08-23 17:05:32 +00:00
Ying Wang
41dbe1e535
Collect and store proguard obfuscation dictionary files.
...
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug: 9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
2013-08-22 20:54:31 -07:00
Ying Wang
7311a344be
Make it easier to enable obfuscation and optimization.
...
With this change, use:
* LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation
* LOCAL_PROGUARD_ENABLED := optimization # to enable optimization
* LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both
Now the meaning of the LOCAL_PROGUARD_ENABLED options:
* full:
Use the build system's default configurations:
with shrink but no obfuscation or optimization,
global proguard flags in build/core/proguard.flags
are applied.
* custom:
The same as "full" except no aapt-generated resource-related
proguard flags.
* nosystem:
Don't use any build system's default configurations; but
aapt-generated proguard flags are still applied. You are
responsible for any other flags.
* disabled:
Disable proguard.
* obfuscation:
The same as "full" but with obfuscation enabled.
* optimization:
The same as "full" but with optimization enabled.
* no value (the default):
The build system chooses the proper value: "full" if it's an
app; "disabled" if it's a library.
You can use more than 1 of them in a meaningful combination,
for example:
LOCAL_PROGUARD_ENABLED := obfuscation optimization
Bug: 10307372
Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 17:12:38 -07:00
Ying Wang
d7674e9a03
am 20c768d2
: am c5cc2f6d
: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
...
* commit '20c768d2128364a6a9373dd8ef432bf55512bf37':
[MIPS] Add support for MXU instructions for Ingenic builds.
2013-08-19 16:21:53 -07:00
Ying Wang
20c768d212
am c5cc2f6d
: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
...
* commit 'c5cc2f6dafaa1826322415f91048b97cfab80556':
[MIPS] Add support for MXU instructions for Ingenic builds.
2013-08-19 16:19:39 -07:00
Ying Wang
c5cc2f6daf
Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
2013-08-19 23:16:27 +00:00
Ying Wang
a3ee330ac5
am fa67740a
: am 25977365
: Merge "mkbootimg: Support custom mkbootimg implementation"
...
* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:29:32 -07:00
Ying Wang
fa67740ae4
am 25977365
: Merge "mkbootimg: Support custom mkbootimg implementation"
...
* commit '259773656ac0c0c4ef588c949aaf21216c44b339':
mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:26:35 -07:00
Ying Wang
259773656a
Merge "mkbootimg: Support custom mkbootimg implementation"
2013-08-19 21:24:07 +00:00
Ying Wang
208c677263
am a7deb085
: Add phony goal GET-INSTALL-PATH
...
* commit 'a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0':
Add phony goal GET-INSTALL-PATH
2013-08-16 17:21:59 -07:00
Ying Wang
a7deb0857c
Add phony goal GET-INSTALL-PATH
...
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.
Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
2013-08-16 13:24:47 -07:00
Pete Delaney
cc41f01490
[MIPS] Add support for MXU instructions for Ingenic builds.
...
This enables an Ingenic build to use MXU asm instructions.
MXU support was just recently added:
ASM: https://android-review.googlesource.com/63701
GCC: https://android-review.googlesource.com/63702
BIN: https://android-review.googlesource.com/#/c/63704/
Change-Id: I2b60567a689efa70ec064dfbb0f241a6bc61aed1
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
2013-08-15 18:32:12 -07:00
Ying Wang
0634a437a3
am 3208b615
: am fc8b6338
: resolved conflicts for merge of d65a7da3
to jb-mr2-dev-plus-aosp
...
* commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489':
No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:42:57 -07:00
Ying Wang
3208b615c5
am fc8b6338
: resolved conflicts for merge of d65a7da3
to jb-mr2-dev-plus-aosp
...
* commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:34:09 -07:00
Ying Wang
fc8b633851
resolved conflicts for merge of d65a7da3
to jb-mr2-dev-plus-aosp
...
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
2013-08-15 12:02:30 -07:00
Ying Wang
d65a7da320
am f4723fa4
: No need to filter out AndroidConfig.h for unbundled build
...
* commit 'f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
2013-08-15 11:55:46 -07:00
Ying Wang
f4723fa49b
No need to filter out AndroidConfig.h for unbundled build
...
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 11:01:10 -07:00
Ying Wang
7a43a0c105
am 66956dc0
: am 396fd67d
: am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit '66956dc063351f30434da9b6bb62183b50996583':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:33:58 -07:00
Ying Wang
66956dc063
am 396fd67d
: am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit '396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:28:18 -07:00
Ying Wang
396fd67d7a
am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit 'b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:26:06 -07:00
Ying Wang
b9eee184f2
am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit 'e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:22:01 -07:00
Ying Wang
a02428e4f6
am 405dac7f
: am 8f01a3c0
: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
...
* commit '405dac7f000af3a02b374533f76a7f2eaedbc954':
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
2013-08-13 18:29:30 -07:00
Ying Wang
405dac7f00
am 8f01a3c0
: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
...
* commit '8f01a3c0cadec174d0b54b06848037ecf20694d9':
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
2013-08-13 18:27:19 -07:00
Ying Wang
8f01a3c0ca
Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
2013-08-14 01:25:06 +00:00
Ying Wang
e391e7a86e
Remove -allowaccessmodification from the basic Proguard flags
...
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug: 10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
2013-08-13 17:40:24 -07:00
Elliott Hughes
32d315a399
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
...
Change-Id: Id7c0e77110653e618d783026cd4b4aeadb3c45ec
2013-08-13 17:05:34 -07:00
Ying Wang
6d98d3b942
am a4ad06ac
: am 750e0c08
: Merge "Prepare upcoming GCC 4.8 release."
...
* commit 'a4ad06ac1db1dfc041fe386b76b22233fdc54341':
Prepare upcoming GCC 4.8 release.
2013-08-13 15:03:24 -07:00
Ying Wang
a4ad06ac1d
am 750e0c08
: Merge "Prepare upcoming GCC 4.8 release."
...
* commit '750e0c088271315b21741429aa124d7ba616fcc7':
Prepare upcoming GCC 4.8 release.
2013-08-13 15:00:55 -07:00
Ben Cheng
aac3f81657
Prepare upcoming GCC 4.8 release.
...
o Add -Wno-unused-parameter -Wno-unused-but-set-parameter to suppress
new warnings.
o Define GCC_COLORS to enable colorful diagnostic messages.
Change-Id: Icbd62300b0e6f39d4e514edec2431a06b4d72421
(cherry picked from internal commit ccd8e6082b
)
2013-08-13 14:52:31 -07:00
Ying Wang
25d64bea75
am 285045bd
: Support for LOCAL_HAL_STATIC_LIBRARIES
...
* commit '285045bd83548196aa3695423c6cd500ebe6d6c1':
Support for LOCAL_HAL_STATIC_LIBRARIES
2013-08-13 14:41:55 -07:00
Ying Wang
285045bd83
Support for LOCAL_HAL_STATIC_LIBRARIES
...
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.
Bug: 10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
2013-08-13 13:48:04 -07:00
Ying Wang
9039db6171
am 4c3a82fa
: am 2863fa7a
: Merge "FDO: support linux-x86 target"
...
* commit '4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
FDO: support linux-x86 target
2013-08-13 10:48:41 -07:00
Ying Wang
4c3a82fa62
am 2863fa7a
: Merge "FDO: support linux-x86 target"
...
* commit '2863fa7a9650fa6df38da61329e2f49d5233c3df':
FDO: support linux-x86 target
2013-08-13 10:45:05 -07:00
Bjorn Andersson
612e2cd0e8
mkbootimg: Support custom mkbootimg implementation
...
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.
Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2013-08-09 16:29:02 -07:00
synergydev
6ecf0ef744
FDO: support linux-x86 target
...
Change-Id: I4a3a1d298176da109df316cf9128f19e77490bc9
2013-08-09 22:41:46 +00:00
Ying Wang
5a7a10411c
am ad7fd29b
: Don\'t bother going through the source tree
...
* commit 'ad7fd29b312bf588b2be3f799715f34ff8a6d46b':
Don't bother going through the source tree
2013-08-09 15:22:04 -07:00
Ying Wang
6d805753d9
am 01c17f03
: am e58868ab
: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
...
* commit '01c17f031286691abeb157cd26ac1785757f07f0':
Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-08-09 13:38:43 -07:00
Ying Wang
01c17f0312
am e58868ab
: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
...
* commit 'e58868ab47fc044e9e7985c8357d83fee4df732a':
Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-08-09 13:36:25 -07:00
Ying Wang
e58868ab47
Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
2013-08-09 20:33:11 +00:00
Ying Wang
0790dcfd3b
am 2e45116d
: am 515e0465
: Merge "FDO: do not support host modules"
...
* commit '2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
FDO: do not support host modules
2013-08-09 12:47:16 -07:00
Ying Wang
2e45116d3a
am 515e0465
: Merge "FDO: do not support host modules"
...
* commit '515e0465d169905e7e454207f3cbb2a57a033ae1':
FDO: do not support host modules
2013-08-09 12:45:00 -07:00
Ying Wang
ad7fd29b31
Don't bother going through the source tree
...
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
2013-08-09 10:08:30 -07:00
The Android Automerger
c618d4f100
Fix klp-dev build file
2013-08-08 07:47:58 -07:00
The Android Automerger
2a516ccce5
"KRS39B"
2013-08-08 07:39:23 -07:00
synergydev
cfdb24f1cb
Link PRIVATE_TARGET_FDO_LIB before shared libraries
...
For global declaration of FDO profile generation and usage,
we need to link PRIVATE_TARGET_FDO_LIB (libgcov.a by default)
prior to linking shared libraries.
TARGET_FDO_LIB is set if feedback directed optimizations
are in use, so we do not need to worry about consistent size
increases from this change.
Change-Id: I543903f58893816f037c9466f31b19dfe822fdf4
2013-08-08 05:31:12 -07:00
Mike Lockwood
c73018c2e9
Fix typo from previous change to fix the build
...
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
2013-08-06 16:15:48 -07:00
Mike Lockwood
6e5d867e30
Add support for overriding default Java libraries on a per-target basis
...
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
synergydev
4a60576029
FDO: do not support host modules
...
Summary:
If built with BUILD_FDO_INSTRUMENT alone, host modules will fail at runtime (during build)
due to failing to create /data in most standard unix user permission cases. If the user does
have full permission to /, /data/profile/ will be created and profiles will be generated there.
Any file generation in the Android Build System should be kept to $OUT.
This commit fixes this bug.
Test Plan:
Build with BUILD_FDO_INSTRUMENT without additional configuration, and host modules will no longer generate profiles
at their runtime.
2013-08-05 02:44:37 -07:00
Ying Wang
4a0929e359
am 38775140
: am 08c07c59
: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
...
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
2013-08-02 17:40:59 -07:00
Ying Wang
387751401c
am 08c07c59
: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
...
* commit '08c07c590322e1cbc8464dd371a2e5120b88e38d':
Remove unnecessary dependencies between host and target modules.
2013-08-02 17:39:01 -07:00
Ying Wang
2c86e70705
Merge "Don't check build prebuilt modules."
2013-08-02 20:31:53 +00:00
Ying Wang
883071ff1f
Don't check build prebuilt modules.
...
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
2013-08-02 13:30:54 -07:00
Ying Wang
ee9e88cf96
am a3827c4b
: am 840f9d0a
: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
...
* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:07:44 -07:00
Ying Wang
a3827c4b6c
am 840f9d0a
: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
...
* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:05:23 -07:00
Brian Carlstrom
5c619fcb5f
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
...
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
2013-08-01 23:31:19 -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
949c4eb073
Delete the kernel file when build config is changed
...
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.
Bug: 10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
2013-08-01 15:46:25 -07:00
Ying Wang
16b92edc38
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-07-31 20:00:45 -07:00
Ying Wang
a8ae7f787d
Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
...
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
2013-07-31 16:26:01 -07:00
Ying Wang
172f5f5746
More verbose on what the build system is doing
...
Sometimes users get confused for long time of no message printed to the
screen.
Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
2013-07-31 12:22:57 -07:00
Jean-Baptiste Queru
8a7cd65585
am 50a402af
: am f1534b62
: Merge "Added generic hook for loading vendor specific defintions"
...
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
Added generic hook for loading vendor specific defintions
2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru
50a402af7a
am f1534b62
: Merge "Added generic hook for loading vendor specific defintions"
...
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions
2013-07-30 07:33:53 -07:00
Ying Wang
54d9cc3fac
am cd9cadbc
: am 7768c91c
: am 94de1eba
: Put a copy of the radio/bootloader files in the dist dir.
...
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 13:00:20 -07:00
Ying Wang
cd9cadbcf6
am 7768c91c
: am 94de1eba
: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:57:19 -07:00
Ying Wang
7768c91c1c
am 94de1eba
: Put a copy of the radio/bootloader files in the dist dir.
...
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:54:11 -07:00
Ying Wang
94de1eba0e
Put a copy of the radio/bootloader files in the dist dir.
...
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
2013-07-26 12:19:20 -07:00
Marie Lennerhagen
9e5efceff9
Added generic hook for loading vendor specific defintions
...
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +00:00
keunyoung
a219bdc0ba
fix build
...
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Ying Wang
5efaa72ac1
am 51aab877
: am 5d1db8b4
: Merge "Allow proto builds to pass in java proto params."
...
* commit '51aab8775ab86990abef411d00f5686e41022eee':
Allow proto builds to pass in java proto params.
2013-07-25 17:04:20 -07:00
Ying Wang
51aab8775a
am 5d1db8b4
: Merge "Allow proto builds to pass in java proto params."
...
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
Allow proto builds to pass in java proto params.
2013-07-25 15:36:07 -07:00
Ying Wang
7661c1d6f1
Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH"
2013-07-25 22:09:32 +00:00
Ulas Kirazci
6e485b545a
Allow proto builds to pass in java proto params.
...
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
2013-07-25 13:40:53 -07:00
Ulas Kirazci
fcbc0b7f0b
am 5094e33b
: Merge "Revert "Allow proto builds to pass in java proto params.""
...
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
Revert "Allow proto builds to pass in java proto params."
2013-07-25 13:35:27 -07:00
Ulas Kirazci
5094e33bdd
Merge "Revert "Allow proto builds to pass in java proto params.""
2013-07-25 20:31:48 +00:00
Ulas Kirazci
24c7289d24
Revert "Allow proto builds to pass in java proto params."
...
This reverts commit 28b46fc16c
.
Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru
8959954976
am be581317
: Merge "Change build id to OPENMASTER"
...
* commit 'be5813170364c382ca2fbc6500d567065449473e':
Change build id to OPENMASTER
2013-07-25 09:07:19 -07:00
Chirayu Desai
0564d0ce33
Change build id to OPENMASTER
...
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
2013-07-25 21:26:32 +05:30
Ben Murdoch
fc2bad5c36
Revert "Allow proto builds to pass in java proto params."
...
This reverts commit 28b46fc16c
.
Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
2013-07-25 11:44:53 +01:00
Ulas Kirazci
dd3d8f4ca9
am 6a5fc54f
: am a825aa13
: Merge "Allow proto builds to pass in java proto params."
...
* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
Allow proto builds to pass in java proto params.
2013-07-25 00:47:09 -07:00
Ying Wang
9352474dae
am 6f9c87ed
: am 45339b01
: Merge "Use consistent search depth."
...
* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
Use consistent search depth.
2013-07-25 00:47:08 -07:00
Ulas Kirazci
6a5fc54fe9
am a825aa13
: Merge "Allow proto builds to pass in java proto params."
...
* commit 'a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
Allow proto builds to pass in java proto params.
2013-07-25 00:44:07 -07:00
Ying Wang
6f9c87ede6
am 45339b01
: Merge "Use consistent search depth."
...
* commit '45339b01d61586aa46c4ca98b37e320879fac050':
Use consistent search depth.
2013-07-25 00:44:07 -07:00
Ulas Kirazci
a825aa1329
Merge "Allow proto builds to pass in java proto params."
2013-07-25 03:04:10 +00:00
Ying Wang
45339b01d6
Merge "Use consistent search depth."
2013-07-25 01:54:44 +00:00
Ulas Kirazci
28b46fc16c
Allow proto builds to pass in java proto params.
...
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.
Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
2013-07-24 18:02:57 -07:00
Scott Main
c3faf216a4
am c5b665ad
: am 0ce71df0
: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
...
* commit 'c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
remove renderscript support lib from javadocs
2013-07-24 16:27:49 -07:00
Scott Main
c5b665addf
am 0ce71df0
: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
...
* commit '0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
remove renderscript support lib from javadocs
2013-07-24 16:20:04 -07:00
Ying Wang
0650d1503d
Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
...
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214
Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
Keun-young Park
efc88c0596
Merge "Fix issue with DEBUG_OUT_DIR not properly selected"
2013-07-24 22:06:49 +00:00
Tom Cherry
60767620c3
Fix issue with DEBUG_OUT_DIR not properly selected
...
- patch from NVDIA
bug: 9968564
Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
2013-07-24 13:55:56 -07:00
Scott Main
5b743677eb
remove renderscript support lib from javadocs
...
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
2013-07-23 21:00:50 -07:00
Doug Zongker
1f790c9733
Merge "distinguish signed and unsigned user builds in UI"
2013-07-23 19:10:05 +00:00
Guilhem IMBERTON
58570e7d5e
Use consistent search depth.
...
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.
Make search depth consistent for these files.
Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
2013-07-23 21:02:15 +02:00
Doug Zongker
a8608a7f7c
distinguish signed and unsigned user builds in UI
...
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds. (This is the property that is displayed under "Build
number" in the Settings UI.) Modify the signing script to remove the
keys tag from this value when signing.
Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
2013-07-23 11:51:04 -07:00
keunyoung
3939476ca0
Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip"
2013-07-22 23:46:10 +00:00
keunyoung
c01780611a
add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip
...
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.
bug: 9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
2013-07-22 15:59:33 -07:00
Michael Runge
065ab7f0df
Merge "Revert "Update OTA to understand SELinux filesystem labels""
2013-07-22 21:57:00 +00:00
Michael Runge
fb9bb205fc
Revert "Update OTA to understand SELinux filesystem labels"
...
This reverts commit fbbd79530a
.
All incremental auto OTAs broken b/9964074
Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
2013-07-22 20:42:44 +00:00
Ying Wang
15cbe8e3d4
Add framework2 to the java pdk package.
...
To fix pdk fusion build.
Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
2013-07-19 14:37:25 -07:00
Nick Kralevich
f771d64bcb
Merge "Update OTA to understand SELinux filesystem labels"
2013-07-18 22:25:59 +00:00
Jeff Brown
4e361bf692
Merge "Split framework jar."
2013-07-18 22:12:37 +00:00
Nick Kralevich
fbbd79530a
Update OTA to understand SELinux filesystem labels
...
Make fs_config aware of SELinux contexts, and output the context
whenever we output the UID / GID / file perms.
Pass the selinux context to the set_perm2() and set_perm2_recursive()
calls. When the OTA script fixes up filesystem permissions, it will
also fix up the SELinux context on the files.
Bug: 8985290
Change-Id: I6419b64c06309a93ac6b2f2cf9fc7f8815adeaf3
2013-07-18 15:04:22 -07:00
Ying Wang
8bf79bb081
am 8bb3306b
: am a1f8cdf7
: Merge "Allow several system property files"
...
* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
Allow several system property files
2013-07-18 10:07:09 -07:00
Ying Wang
8bb3306b76
am a1f8cdf7
: Merge "Allow several system property files"
...
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
Allow several system property files
2013-07-18 10:02:45 -07:00
Jeff Brown
ae859f9b64
Split framework jar.
...
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
Johan Redestig
674a27ddaf
Allow several system property files
...
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.
Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
2013-07-16 15:15:16 +02:00
Brian Carlstrom
8abff76d8f
Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
...
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
2013-07-15 16:44:26 -07:00
Ying Wang
6e9151b1a7
am 988251c9
: Fix error.
...
* commit '988251c92269676c891dcb548fecdc100755b431':
Fix $(so_suffix) error.
2013-07-15 09:01:59 -07:00
Ying Wang
988251c922
Fix $(so_suffix) error.
...
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326
)
2013-07-15 15:57:25 +00:00
Ying Wang
80b71fa326
Fix $(so_suffix) error.
...
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
2013-07-15 08:47:33 -07:00
Ying Wang
3aa8eb6810
am ba9636d4
: Establish the built module dependencies on prebuilt shared library
...
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
Establish the built module dependencies on prebuilt shared library
2013-07-12 22:34:46 -07:00
Ying Wang
ba9636d47f
Establish the built module dependencies on prebuilt shared library
...
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657
)
2013-07-13 05:31:11 +00:00
Ying Wang
ada8f29657
Establish the built module dependencies on prebuilt shared library
...
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
2013-07-12 22:05:14 -07:00
JP Abgrall
1390cac3ce
core: don't hardcode "out" during findleaves.py invocations.
...
"out" can be $OUT_DIR
Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
2013-07-11 19:08:06 -07:00
Jeff Brown
85fe0c5446
am 9d80f708
: am a3d60ae8
: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-11 10:17:00 -07:00
Ying Wang
fd30db5f29
Merge "Bring in runtime-specific product variables in a more general way."
2013-07-11 01:23:29 +00:00
Ying Wang
22ef79850e
Bring in runtime-specific product variables in a more general way.
...
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
2013-07-10 18:14:40 -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
Jeff Brown
9d80f70857
am a3d60ae8
: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit 'a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-09 16:48:17 -07:00
Jeff Brown
a3d60ae86f
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
2013-07-09 23:44:41 +00:00
Jeff Brown
9977ddf0cd
Revert "Remove mediarouter v7 support library from SDK."
...
This reverts commit 0eacd936b7
.
Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
2013-07-09 00:35:00 +00:00
Ying Wang
f755fa0d8c
am d235ed2a
: Respect DISABLE_PROGUARD
...
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
2013-06-28 13:43:25 -07:00
Ying Wang
d235ed2afb
Respect DISABLE_PROGUARD
...
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
2013-06-28 13:37:27 -07:00
Brian Carlstrom
1aeee8bb66
Move from WITH_ART to PRODUCT_RUNTIMES
...
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
Ying Wang
fcec57a116
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
2013-06-26 18:00:17 -07:00
Ying Wang
4c4b6b2a0b
am f84bf8d0
: Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 14:13:09 -07:00
Ying Wang
f84bf8d0ca
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit 8578cab066
)
2013-06-25 21:05:11 +00:00
Ying Wang
8578cab066
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
2013-06-25 12:34:11 -07:00
Ying Wang
10e41c3275
am c012edbc
: am 42aaacf1
: am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'c012edbc519b74456530c26719133f96d4574de3':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:44:47 -07:00
Ying Wang
c012edbc51
am 42aaacf1
: am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit '42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:42:32 -07:00
Ying Wang
42aaacf183
am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:37:38 -07:00
Raghu Gandham
6faf71647a
Do not use -msynci flag for Xburst 4780 cores
...
synci does not provide coherency between CPU's on this device
Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
2013-06-20 13:29:49 -07:00
Jeff Brown
c39063df9b
am bd1c3a21
: am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:43:23 -07:00
Jeff Brown
bd1c3a2112
am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:09 -07:00
Jeff Brown
0eacd936b7
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00
Mike Lockwood
051a1740eb
Add support for WITHOUT_CLANG
...
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
2013-06-14 10:52:50 -07:00
Ying Wang
951e0f1e8d
am fe365531
: am 1e1241ce
: Dist static Java library modules.
...
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
2013-06-12 15:41:57 -07:00
Ying Wang
fe365531b0
am 1e1241ce
: Dist static Java library modules.
...
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d
Dist static Java library modules.
...
With this change, we can build and dist static jar files, as well as
apks.
Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
2013-06-12 15:29:38 -07:00
Ying Wang
8f5868057c
am 38cdd442
: Tweak proguard flags in the 2 files.
...
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f
Tweak proguard flags in the 2 files.
...
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-06-12 11:04:49 -07:00
Torne (Richard Coles)
4297ce7d0e
Merge "Add webviewchromium to the preopt jar list."
2013-06-11 13:13:45 +00:00
Ying Wang
d72db32f84
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-06-06 18:05:53 -07:00
Torne (Richard Coles)
ef5d599600
Add webviewchromium to the preopt jar list.
...
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.
Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
2013-06-06 14:57:42 +01:00
Torne (Richard Coles)
d919c7a314
Add proper deps for jarjar rules files.
...
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.
Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
2013-06-05 14:25:47 +01:00
Ying Wang
8216f3228f
Merge "Tweak proguard flags in the 2 files."
2013-05-31 15:24:56 +00:00
Stephen Hines
1e18897689
am 6c380fe5
: am 1dd9f19e
: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
add renderscript to support library javadocs
2013-05-30 15:34:00 -07:00
Stephen Hines
6c380fe5da
am 1dd9f19e
: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
add renderscript to support library javadocs
2013-05-30 14:14:29 -07:00
Ying Wang
1b28087a58
Tweak proguard flags in the 2 files.
...
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-05-30 10:45:46 -07:00
Scott Main
af44e90b19
add renderscript to support library javadocs
...
Bug: 9188088
Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00:00
Ying Wang
bba6263203
Enable Proguard for eng build too.
...
With this change, all build variants are now with Proguard enabled,
unless you explicitly set DISABLE_PROGUARD to true.
Change-Id: I0f9b566b5ab3c3d961ffd6ab696e573bc59553b0
2013-05-23 10:26:49 -07:00
Brian Carlstrom
6901768e36
Add WITH_ART
...
(cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)
Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
2013-05-22 10:49:57 -07:00
Ying Wang
a25b9b83bf
am 210aee35
: am fa29872a
: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit '210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:31:57 -07:00
Ying Wang
210aee35a9
am fa29872a
: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:25:39 -07:00
Pete Delaney
90ce453470
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
...
1. Added xburst ARCH_VARIANT file 'mips32r2-fp-xburst.mk'.
a) Added -mno-fused-madd GCC option.
2. Removing -mno-fused-madd GCC option for LLVM.
Change-Id: I947a74eb89c05ae321417533c3c40241abc6f965
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
2013-05-20 15:27:20 -07:00
Jean-Baptiste Queru
64dbf369a8
Fake version number for AOSP master - do not merge
...
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
2013-05-20 09:50:39 -07:00
Ying Wang
a34a0030b8
am 82574cb1
: am 57453519
: Split out proguard_basic_keeps.flags
...
* commit '82574cb101d34981bccd56513059b3d0bd3267a0':
Split out proguard_basic_keeps.flags
2013-05-17 10:35:48 -07:00
Ying Wang
82574cb101
am 57453519
: Split out proguard_basic_keeps.flags
...
* commit '57453519084feb13f8a2c00b6985b32427a06b5a':
Split out proguard_basic_keeps.flags
2013-05-17 10:33:11 -07:00
Ying Wang
5745351908
Split out proguard_basic_keeps.flags
...
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.
Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
2013-05-17 10:02:00 -07:00
Rom Lemarchand
8805930b6f
core: combo: arm: add cortex-a8 target
...
Change-Id: I83e409dd048762acbd2e2dec9b0095933141cff0
2013-05-14 20:16:16 -07:00
Brian Carlstrom
7358390697
Merge "add a fake data target."
2013-05-14 20:42:53 +00:00
Tim Murray
311605bc2e
am 5861448a
: am 205aaf16
: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
...
* commit '5861448a2d85cbfdc814621095889978060dd0de':
Don't build librs.*.so in bundled branches since we'll use native RS.
2013-05-14 12:49:22 -07:00
Tim Murray
5861448a2d
am 205aaf16
: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
...
* commit '205aaf16e77edbdb4ea4a2f2edcc6d6a6b6f9c4c':
Don't build librs.*.so in bundled branches since we'll use native RS.
2013-05-14 12:46:08 -07:00
Tsu Chiang Chuang
40da8832c9
add a fake data target.
...
(cherry picked from commit 3ba7baf14875d3cd360006be7dffe7e4e0cf1882)
Change-Id: I691d4dda65437d3f57e77ed207da406fd1f53355
2013-05-14 10:58:26 -07:00
Tim Murray
8e0567ae77
Don't build librs.*.so in bundled branches since we'll use native RS.
...
bug 8939828
Change-Id: I3f991ad7b6b1590063a9048326fd95edc483af13
2013-05-13 15:46:37 -07:00
Ying Wang
5338fbfaca
Install to TARGET_OUT_APPS_PRIVILEGED if LOCAL_PRIVILEGED_MODULE is true
...
Change-Id: I268b8652f18034aa3fdd3126ebf6196f78c4bbb2
2013-05-08 15:49:08 -07:00
Ying Wang
560f7099a8
am a1c0206c
: am 0eb35626
: Add extra libgcc.a only for unbundled build.
...
* commit 'a1c0206c31e9373e712792a62bc07f609822bca9':
Add extra libgcc.a only for unbundled build.
2013-05-06 12:20:30 -07:00
Ying Wang
a1c0206c31
am 0eb35626
: Add extra libgcc.a only for unbundled build.
...
* commit '0eb35626da3e16d8db7756913433ee37f7ec2f49':
Add extra libgcc.a only for unbundled build.
2013-05-06 11:10:54 -07:00
Igor Murashkin
7e6362cc37
am b71b2905
: Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev
...
* commit 'b71b290587a1c64c89745fa730bcbb0c4d69f6cc':
DO NOT MERGE: Change build id to JB_MR2
2013-05-06 08:44:42 -07:00
Ying Wang
0eb35626da
Add extra libgcc.a only for unbundled build.
...
We can save some space for platform build with this.
Previously an extra libgcc.a was put before libc.so so libraries built
against new platform can run on old platforms. This is needed only for
unbundled build.
Bug: 8805022
Bug: 8247455
Change-Id: I3c3e0092b06ec3804659d5cae048d29e0d2bf7ad
2013-05-03 14:38:36 -07:00
Igor Murashkin
b71b290587
Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev
2013-05-03 20:18:58 +00:00
Igor Murashkin
3095dd7737
DO NOT MERGE: Change build id to JB_MR2
...
Change-Id: I5c87f83e53ca534e816083a639c6798deb1d93f2
2013-05-03 12:18:07 -07:00
Torne (Richard Coles)
273bb05358
am 10dca3c4
: am 278bbf12
: Don\'t concatenate the NOTICE file for a single module.
...
* commit '10dca3c41111f362fcd6acb519b45847817f75c9':
Don't concatenate the NOTICE file for a single module.
2013-04-30 16:49:59 -07:00
Torne (Richard Coles)
10dca3c411
am 278bbf12
: Don\'t concatenate the NOTICE file for a single module.
...
* commit '278bbf126321304e125c8226b0cb8b51f25f3f0e':
Don't concatenate the NOTICE file for a single module.
2013-04-30 16:42:46 -07:00
Dianne Hackborn
8def4f37cf
Merge "Bump up to API 18 to match jbmr2."
2013-04-30 22:06:59 +00:00