Commit Graph

3559 Commits

Author SHA1 Message Date
Mike Lockwood ab9d66730d Merge ""make dist" should not try to package apps for embedded builds" 2013-10-02 19:01:05 +00:00
Stephen Hines 147f66c1e8 Duplicate i686 target arch options for x86_64.
Change-Id: I94a18562c38a20bac526b348eb98c2aba67a431f
2013-10-02 11:35:29 -07:00
Pavel Chupin fd82a49e04 x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.

Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 20:58:54 +04:00
Ying Wang 07e8056b9f am 2ef85bd1: am d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
* commit '2ef85bd1aef3c97ec4afd042e1bbf56229629b1b':
  Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
2013-10-02 09:56:57 -07:00
Ying Wang 2ef85bd1ae am d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
* commit 'd74b538d9a45e7698f5bbe10e3908f64b65eb81e':
  Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
2013-10-02 09:37:05 -07:00
Mike Lockwood 253555b5e3 "make dist" should not try to package apps for embedded builds
Change-Id: Icbe522737f7b8a44c8a458b32678fe0472b94dff
2013-10-02 07:51:11 -07:00
Ying Wang d74b538d9a Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
only if the module is built against the platform, not the SDK.
Previously it added it if it's doing a platform build.
But we can do an apps_only build inside the platform source tree and
such a build may build modules against the platform.
This fixes the apps build in the platform source tree.

Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
2013-10-01 18:16:45 -07:00
Stephen Hines c54e81c0df Add FORCE_BUILD_RS_COMPAT option.
This enables the .so libraries to be built for apps using the
RenderScript support library. Traditionally, we trim these .so
files from full platform builds.

Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
2013-09-30 15:57:36 -07:00
Guang Zhu 65ca9e6f02 follow up jar manifest change for ENABLE_INCREMENTALJAVAC
Change-Id: Id3df078691cfe5e9221ec5085a6b02ac6b6bb008
2013-09-25 15:27:20 -07:00
Ying Wang 4c7a2c1207 am 392d042c: am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '392d042c217b43d714e0bf5fe8f69cd2d0dbae90':
  Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:40:29 -07:00
Ying Wang 392d042c21 am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit 'b6da30c3724cc2a452be2c1ae425eff4f7d55944':
  Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:37:19 -07:00
Ying Wang b6da30c372 am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '2408479cf9cf9cfe87e464e9b5d2f36143818d37':
  Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:35:04 -07:00
Ying Wang 2408479cf9 Allow module to specify LOCAL_INSTALLED_MODULE_STEM
With this change, you can install a shared library with module name foo
as bar.so to the system.img with:
LOCAL_INSTALLED_MODULE_STEM := bar.so
Note that we in general still disallow a static/shared library to
specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build
system uses LOCAL_MODULE to compute build time dependencies, such as
export_includes, the -l linker flag etc.
Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed
file name and if any other module links against this library, you may
run into runtime error: the library name baked in to the binary is not
the same as file name in the system image.

Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
2013-09-25 12:30:59 -07:00
Guang Zhu 5c9a1a4064 enable embeded build number in jar manifest
* if a module uses LOCAL_JAR_MANIFEST
* if the manifest file has the string '%BUILD_NUMBER%' in it

Bug: 10793010

Change-Id: I1ed3dae0706e6ad26c2bce68269c1abb7b4a7325
2013-09-25 10:50:23 -07:00
Eino-Ville Talvala 8dcb53c691 am 28db7b46: am ac079b1d: Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
* commit '28db7b46dd8c96813ac7d548c7344b4f3bcb4f44':
  Add android-ex-camera2 static java library to PDK.
2013-09-24 18:12:56 -07:00
Eino-Ville Talvala 28db7b46dd am ac079b1d: Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
* commit 'ac079b1da45431197cc9d821bf2234d2e65f28a9':
  Add android-ex-camera2 static java library to PDK.
2013-09-24 18:11:14 -07:00
Eino-Ville Talvala ac079b1da4 Merge "Add android-ex-camera2 static java library to PDK." into klp-dev 2013-09-25 01:09:20 +00:00
Eino-Ville Talvala 735bba8be0 Add android-ex-camera2 static java library to PDK.
Library is located frameworks/ex/camera2/public.
This is required to allow pdk/apps/CameraITS to build in the PDK.

Bug: 10337323
Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
2013-09-24 16:57:28 -07:00
Ying Wang feb75860ff Allow module to specify LOCAL_INSTALLED_MODULE_STEM
With this change, you can install a shared library with module name foo
as bar.so to the system.img with:
LOCAL_INSTALLED_MODULE_STEM := bar.so
Note that we in general still disallow a static/shared library to
specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build
system uses LOCAL_MODULE to compute build time dependencies, such as
export_includes, the -l linker flag etc.
Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed
file name and if any other module links against this library, you may
run into runtime error: the library name baked in to the binary is not
the same as file name in the system image.

Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
2013-09-24 16:09:54 -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
Baligh Uddin fe66c390fb bump version to 4.3.1 2013-09-23 15:05:45 -07:00
Brian Carlstrom e7648fe4f5 am a0cf24a8: am 71fc41df: Enable art for user builds
* commit 'a0cf24a8055a84e30b5eb5d54067eb99d731b749':
  Enable art for user builds
2013-09-20 11:20:15 -07:00
Stephen Hines d2ecb3de3a Switch from HOST->BUILD for other LLVM components.
Bug: 10653601
Change-Id: Ia841c760da6f864df6ae76e5a07bc1d307198691
2013-09-19 16:06:22 -07:00
Brian Carlstrom a0cf24a805 am 71fc41df: Enable art for user builds
* commit '71fc41df1eea345949e8e838b573ac367a52f9c7':
  Enable art for user builds
2013-09-19 16:03:32 -07:00
Brian Carlstrom 71fc41df1e Enable art for user builds
Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
2013-09-19 15:07:28 -07:00
Stephen Hines 475d366d5c Merge "Switch to using BUILD instead of HOST variables." 2013-09-19 21:27:07 +00:00
Stephen Hines 2912425fc1 Merge "Enable prebuilt host LLVM." 2013-09-19 19:45:24 +00:00
Stephen Hines 09e27f1afc Switch to using BUILD instead of HOST variables.
This fixes issues where we cross-compile Windows binaries on a Linux host.

Change-Id: Ief6558bf9a565b6df7b63207f6e92ef272066463
2013-09-19 12:43:00 -07:00
Ying Wang 9eae1e6cae am 4a712bfb: resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp
* commit '4a712bfb6f2e93287bacc348c8513d9b0da7cfcc':
  Extend x86 to have different arch variants
2013-09-19 10:20:20 -07:00
Ying Wang 4a712bfb6f resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp
Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369
2013-09-19 10:15:38 -07:00
Ying Wang 70190a2b02 am b71677b1: Merge "Extend x86 to have different arch variants"
* commit 'b71677b17cc0100caf16209bfcd1eee529e2eb5a':
  Extend x86 to have different arch variants
2013-09-19 09:47:27 -07:00
Ying Wang b71677b17c Merge "Extend x86 to have different arch variants" 2013-09-19 16:45:16 +00:00
Stephen Hines 578a84dc45 Enable prebuilt host LLVM.
Bug: 10653601

Change-Id: Ie127f9e78ea9b90b2243e15d9f933c46a4896542
2013-09-18 17:10:26 -07:00
Negreanu Marius Adrian ae5c0ab272 Extend x86 to have different arch variants
Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com>
Author: Andrew Boie <andrew.p.boie@intel.com>
Author: Daniel Leung <daniel.leung@intel.com>

Currently, x86 target only has generic i686 and x86-atom
as arch variants. This patch adds the ability to have
more than two arch variants. Defining a new arch variant
is similiar to ARM targets, by adding a new file in
core/combo/arch/x86. These files also define what
capabilities the targeting CPU has (e.g. having SSE2,
SSE3, etc.).

We define arch variants for Sandy Bridge, Ivy Bridge,
Haswell; upcoming arches can be easily added to this
set with future patches.

Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-09-18 14:14:22 -07:00
Ying Wang 293ad10d25 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-09-18 09:01:03 -07:00
Ben Cheng 670b8d2251 Switch ARM platform toolchain to GCC 4.8.
Change-Id: If08cfb2b9d86c08d3b658470440242b0af4d9916
2013-09-17 09:35:14 -07:00
Ying Wang 7d153833d8 am a85afdb8: Merge "Add support for WITHOUT_CLANG"
* commit 'a85afdb83d4d9d0fb03024eee9937b0882dd81ad':
  Add support for WITHOUT_CLANG
2013-09-16 13:40:49 -07:00
Mike Lockwood d90e2404dd Add support for WITHOUT_CLANG
(cherry picked from commit 051a1740eb)

Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f
2013-09-16 10:20:08 -07:00
Ying Wang 80abb45648 am c5c32d8f: am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit 'c5c32d8f4a202f19a967678c283e71b75d1061c8':
  Switch x86 default compiler to multilib version
2013-09-14 13:53:48 -07:00
Ying Wang c5c32d8f4a am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit 'fad629f4dd07720b427c6a219ad93886e23ca277':
  Switch x86 default compiler to multilib version
2013-09-14 13:49:15 -07:00
Ying Wang fad629f4dd am 7f2ad751: Merge "Switch x86 default compiler to multilib version"
* commit '7f2ad751aebf9d13d63f20a451c28d4a41c4569a':
  Switch x86 default compiler to multilib version
2013-09-14 13:47:03 -07:00
Ying Wang 7f2ad751ae Merge "Switch x86 default compiler to multilib version" 2013-09-14 20:45:00 +00:00
Ying Wang 4742d055ae Use llvm components built from source for now
Change-Id: I2ba3e81199b95d827dd2960180dda6070fe9ea24
2013-09-14 12:04:43 -07:00
Stephen Hines c301fb56ff Switch to a different set of header includes for prebuilt host Clang.
Bug: 10653601
Change-Id: I94ebd75847580ee77df57825c2325b164b77f9da
2013-09-14 00:07:22 -07:00
Stephen Hines 75fbea66a5 Merge "Create initial rules for using Clang/LLVM HOST prebuilts." 2013-09-14 05:36:45 +00:00
Ying Wang 717ee5ab0e am 13871a8f: resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
* commit '13871a8f500b0f9a5e167be3487c1e8d1f92f327':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:56:51 -07:00
Ying Wang 13871a8f50 resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
Ying Wang 65d5e78865 am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:43:34 -07:00
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
Stephen Hines ed2b7b349a Create initial rules for using Clang/LLVM HOST prebuilts.
Bug: 10653601

Use FORCE_BUILD_LLVM_COMPONENTS=true to re-enable the traditional
LLVM HOST build.

Change-Id: I3d0891edd4818eb685641ef5d0068cd152470e5c
2013-09-12 20:36:28 -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
Ying Wang 193bb2cd74 Merge "Drop the [no]proguard. prefix for the intermediate targets" 2013-09-13 00:48:21 +00:00
Ying Wang 7b7929ad38 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:35:21 -07:00
Scott Main 1a2709f05f add renderscript to the support lib javadocs
this is a round-about change to handle conflict from Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1

Change-Id: Iac5f91e52c1a962abb26864bac9343657a8cf9b6
2013-09-12 16:47:05 -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 6dc9e43c05 resolved conflicts for merge of f913c2dd to master
Change-Id: Ie070cae60e0c78778d42fda30599df95d9532b5b
2013-09-12 09:56:31 -07: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
Yohann Roussel 14f852972e Merge "Stubs of android-support-multidex-instrumentation." 2013-09-12 07:34:48 +00:00
Kenny Root 14d4310803 Merge "Add Junit4 to the classpath for CollectAllTests" 2013-09-12 05:26:01 +00:00
Andrew Hsieh 69e339d783 am 246daf75: resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp
* commit '246daf755a6607db575b5bef13d5cc761d4ebbb0':
  Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
2013-09-10 19:34:10 -07: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 69fecd43c1 am 46f00b61: am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
* commit '46f00b6167f4c23dd4874abe9377bac85e965b2f':
  Update OTA to understand SELinux labels and capabilities
2013-09-10 13:17:18 -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 24297f2541 am 061b89c0: am 20ef354e: Load the ONE_SHOT_MAKEFILE even in dont_bother mode
* commit '061b89c0bfe2e78367644fc1c3e73720b4c592ef':
  Load the ONE_SHOT_MAKEFILE even in dont_bother mode
2013-09-09 12:19:28 -07: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 b3b3120ab0 am b4c0656c: am 39e08f28: Delete dead code.
* commit 'b4c0656ce6e0a9f934038e972fcfc68af609b897':
  Delete dead code.
2013-09-09 11:42:06 -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 5557f80660 resolved conflicts for merge of e47bf114 to master
Change-Id: I9f182c287ea067a8b2666ea4d923d04cfa618871
2013-09-05 15:54:47 -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
Yohann Roussel 584f601910 Stubs of android-support-multidex-instrumentation.
For the SDK.

Change-Id: I54bee4d89d7c291933673c3b5bf7f2b85f904377
2013-09-05 14:31:31 +02:00
Todd Poynor e52130fd75 build: remove HAVE_OOM_ADJ
This define is no longer used.

Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
2013-09-04 17:46:42 -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 5dcf1eeb06 Merge "Add "WITH_SYNTAX_CHECK=1 make ..."" 2013-09-04 23:45:57 +00: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 b107cc3c4e am 1be5fb67: am 25f39b2f: am 62cd88d0: Merge "FDO: Only support locally"
* commit '1be5fb675ac24e493b3712be6488848d6b4fae4b':
  FDO: Only support locally
2013-09-04 11:57:29 -07: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
Andrew Hsieh e7c2d14e5a 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: Iaeedd07d5719f9df9675ab57e307e28a9c855c1b
2013-09-04 09:20:38 +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) e53a2dd570 am baa01faf: am 4f30a507: Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev
* commit 'baa01faf1d9c5baf9e431c359ba7fb104c9f2842':
  Fix handling of .o files in LOCAL_GENERATED_SOURCES.
2013-08-30 02:46:04 -07: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 fbf26d6f2a am c97e86dc: am c62c92c3: Create an empty zip file if no dict file found.
* commit 'c97e86dca8de224960f592f4104c585c40a7946a':
  Create an empty zip file if no dict file found.
2013-08-28 18:45:52 -07: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 18c5126262 am 54e81f54: am 37b82aac: Skip compiling Java if an apk has no Java code.
* commit '54e81f546ccbb82b1b3a6d27026f8c58bd24731d':
  Skip compiling Java if an apk has no Java code.
2013-08-28 17:36:31 -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 664a236795 resolved conflicts for merge of 9915650b to master
Change-Id: Ice0f39a84363b76ea37801eb09a1d5cfd79d38fe
2013-08-28 14:45:37 -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 53efca6c5b am 161aa74d: am 576e0146: Make it a fatal error if no source files for Java module.
* commit '161aa74de6aaa03d67f9dac10b71f15ebe728b3c':
  Make it a fatal error if no source files for Java module.
2013-08-28 14:06:41 -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
Ben Cheng 1cea0755f4 Re-tighten default compiler options.
Remove "-Wno-unused-parameter -Wno-unused-but-set-parameter" added for
GCC 4.8 experiment.

BUG: 10495043
Change-Id: I774deb09c782fe79eb473fdefd471725a1f97fd5
2013-08-28 11:06:31 -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 2ef478933d am bf05f6cc: am 495f6840: In apps_only build dist a module only if it has a BUILT file.
* commit 'bf05f6cc3ecb6f8ca66e4bcb8e750116ddc59691':
  In apps_only build dist a module only if it has a BUILT file.
2013-08-27 15:09:46 -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 600c0509ec am ea0237dd: am 10d2e0cd: Remove the vendor-specific vars from the protected list.
* commit 'ea0237dd89b45fe22b4cd2f07175514c5eb246ef':
  Remove the vendor-specific vars from the protected list.
2013-08-26 15:17:26 -07:00
Ying Wang 366957d636 am a7045832: am 62c81f82: Collect NOTICE files for apps_only build.
* commit 'a7045832658da491f8e4436d747ba8d17fc8fef9':
  Collect NOTICE files for apps_only build.
2013-08-26 15:17:25 -07:00
Ying Wang b5101e3242 am 85418952: am b6cf5b2f: am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '8541895267c385656e31dca78848091a4720661d':
  Collect and store proguard obfuscation dictionary files.
2013-08-26 15:17:25 -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 c6ff6987f4 Treat LOCAL_APK_LIBRARIES like shared Java libraries.
This fix proguard build.
Bug: 10307372

Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
(cherry picked from commit 638ce57a58)
2013-08-24 01:57:02 +00: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 53a64d90d7 am 92ed0994: am c3e977ac: am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '92ed0994d94db0f52815841669707ad0ed8a2257':
  Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:24:01 -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 752a316ab7 am 76570123: am 58ad7061: am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '765701236789cda7ebdf76d1f8f1592cdaa8e436':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 10:20:28 -07:00
Ying Wang e260b24cde am 670a7a63: am c5b72527: am ec3c15e5: am 04c4d34d: am 7311a344: Make it easier to enable obfuscation and optimization.
* commit '670a7a6389948c325399ae9bb3dc6a678f9982f8':
  Make it easier to enable obfuscation and optimization.
2013-08-23 10:20:28 -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