Commit graph

3419 commits

Author SHA1 Message Date
Ying Wang
4b7d8f119a Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS" 2013-09-14 00:41:30 +00:00
Ying Wang
8639f2dda2 am 3057adba: Drop the [no]proguard. prefix for the intermediate targets
* commit '3057adbace1eb57cd73f982eb06d897632ece554':
  Drop the [no]proguard. prefix for the intermediate targets
2013-09-12 21:37:25 -07:00
Ying Wang
3057adbace Drop the [no]proguard. prefix for the intermediate targets
Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-12 17:50:11 -07:00
Scott Main
0e50619ad2 am 3938f3e1: am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '3938f3e1af045e887735884b059224a86f46db74':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:19:36 -07:00
Scott Main
3938f3e1af am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:17:26 -07:00
Scott Main
7cba6168c3 am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:16:02 -07:00
Scott Main
9a3fb8711f Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev 2013-09-12 19:14:19 +00:00
Kenny Root
ecbc22ead1 am 43077645: Merge "Add libcore.conscrypt tests back to CTS"
* commit '43077645b5ade27fafff808f11539f6a3e176544':
  Add libcore.conscrypt tests back to CTS
2013-09-12 11:55:42 -07:00
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