StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,934 Commits 1 Branch 0 Tags
400c48cc3b22b791115359c3f18e2959e244e96a
Commit Graph

117 Commits

Author SHA1 Message Date
Yohann Roussel
400c48cc3b Merge "Support dx generating multiple dex files." 2013-08-22 08:31:14 +00:00
Yohann Roussel
8ffe9c3e79 Support dx generating multiple dex files. 
Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.

Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
 2013-08-20 20:53:40 +02:00
Ying Wang
a3b7593546 Support to optionally run rmtypedefs. 
Bug: 10330586
Change-Id: I6ddfca2ec986cf2c82b0942b7a5360508f095e9a
 2013-08-14 18:20:54 -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
Jeff Brown
ae859f9b64 Split framework jar. 
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
 2013-07-17 21:08:18 -07: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
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
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
Ulas Kirazci
bde274ef83 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
 2013-04-03 13:37:07 -07:00
Stephen Hines
8db4ccea4a Link RS compatibility files with libc and make bcc_compat a regular dep. 
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.

Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
 2013-03-27 16:51:38 -07:00
Tim Murray
1a6f09a48c Add support for multiple architectures with RS compat lib. 
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
 2013-03-06 17:15:26 -08:00
Stephen Hines
9ac9b53dc6 Reduce RS build verbosity. 
Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
 2013-02-27 00:51:08 -08:00
Ying Wang
370fa673b5 Build rs_compatibility_jni_libs into product-specific dir 
They can't be shared across products.

Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
 2013-02-25 16:06:42 -08:00
Ying Wang
9c3aa053f5 Order-only deps on LOCAL_C/CXX and BCC_COMPAT 
So if the host binaries are updated, we don't run the rules again.
Bug: 8234097

Change-Id: I6c888d2b3ae39db1f91411da630ac098273f139d
 2013-02-20 13:34:05 -08:00
Stephen Hines
d1f4e18574 Fix duplicate build rule warning. 
Change-Id: Ieb90af933bff162cd1ed5aa36fc1efd2b4ca7e04
 2013-02-19 14:31:59 -08:00
Stephen Hines
ec02b4f8d5 Switch to librs.FOO.so instead of libFOO.so to prevent collisions. 
Change-Id: Ifda68f3d416d87d6f4916e44a350f15b68994536
 2013-02-15 23:02:20 -08:00
Stephen Hines
4cc701480c Merge "Remove dependency on libcompiler_rt.so for RS compatibility." 2013-02-13 22:36:15 +00:00
Stephen Hines
4404433876 Remove dependency on libcompiler_rt.so for RS compatibility. 
We are now using libcompiler_rt.a, so we don't need the shared version.

Change-Id: I1d35238581dc344de6918e037e89aa0362885e0e
 2013-02-13 14:13:40 -08:00
Ying Wang
8392284a70 Disable LOCAL_RENDERSCRIPT_COMPATIBILITY for non-arm builds 
This fixes the x86 build.

Change-Id: I370063fc83915c4c20cee08cc4feae68c7d7292b
 2013-02-13 10:48:28 -08:00
Stephen Hines
6adffc196f Remove libcompiler_rt.so dependency for RS compat lib. 
Change-Id: I0d871c9c7d7946b8551fdefd201603bb59ea010e
 2013-02-11 20:03:38 -08:00
Stephen Hines
7b3c71d1be Add libcompiler_rt.so as a JNI dependency for RS compatibility. 
Change-Id: I8840faaa86ae31abc3d78553eecdd1e642c6d15d
 2013-02-11 11:11:22 -08:00
Stephen Hines
90a94b4bb2 Build RS compatibility library apps with libcompiler_rt.so too. 
Change-Id: Ibc14ceb473bef23ab9e28f3a6bf7e4e99d529c01
 2013-02-07 14:00:27 -08:00
Shih-wei Liao
c8dfc169c8 Fix libcompiler-rt. Use the official name libcompiler_rt. 
Rename libcompiler-rt to libcompiler_rt.

Change-Id: I62e77d4dc83458bc238bd8320b70ddb7efe0dd12
 2013-02-07 13:46:29 -08:00
Stephen Hines
3b0fa1083e Copy RS compatibility libraries to /system/lib/ for bundled builds. 
Bug: 8138884
Change-Id: I74fb0c5835974af3c6e34fcd2d9ebfc2e7b08b4d
 2013-02-06 20:16:22 -08:00
Tim Murray
99b060f624 Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects. 
This change also adds the NDK library path for unbundled builds.

Bug: 7419958
Change-Id: Id8b608b5dd49d72bec697da8fa7a9393d2ab735f
 2013-02-01 12:01:38 -08:00
Ying Wang
1d977e3183 Refactor calculation LOCAL_CHECKED_MODULE 
To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
 2013-01-30 14:23:58 -08:00
Ying Wang
ef1a9613cb Revert "Refactor calculation LOCAL_CHECKED_MODULE" 
This reverts commit ba99e69424

Change-Id: I3c42dea56376d26a5bb77b4944ae17a6875aadbb
 2013-01-30 20:44:49 +00:00
Ying Wang
ba99e69424 Refactor calculation LOCAL_CHECKED_MODULE 
To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
 2013-01-30 11:22:06 -08:00
Stephen Hines
8f199b0588 Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects." 
This reverts commit ba6a7e1d46

Change-Id: I2855923e67c226d39fe362342570e9ab96b885b8
 2013-01-23 18:39:05 +00:00
Stephen Hines
ba6a7e1d46 libclcore.bc comes from prebuilts/sdk for unbundled projects. 
This change also adds the NDK library path for unbundled builds.

Bug: 7419958

Change-Id: If22823c3890f5507d486e654a1e0296c06a2e239
 2013-01-22 17:56:37 -08:00
Stephen Hines
9541f5864d Build RS compatibility objects with libcompiler-rt.a. 
Change-Id: Ic49fdc30b1d4568bbdc94338e116a31a1ade1e80
 2013-01-18 16:41:22 -08:00
Ying Wang
2ce71aa062 Add new LOCAL_PROGUARD_ENABLED option "nosystem" 
With which we don't include proguard flags defined by the build system.
Bug: 7990659

Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
 2013-01-11 15:31:45 -08:00
Stephen Hines
f692513071 Clean up libRSSupport.so and libclcore.bc dependencies. 
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
 2012-12-17 17:59:47 -08:00
Stephen Hines
e719f28d93 Build rules for Renderscript compatibility library. 
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
 2012-12-12 14:58:02 -08:00
Joe Onorato
7aff0a751e am 0cf8969b: am 2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES 
* commit '0cf8969bebcc40ee0ba1d720a4cc3c0003ac1265':
  make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
 2012-10-20 19:22:35 -07:00
Joe Onorato
537ea6be79 resolved conflicts for merge of 50462d67 to master 
Change-Id: I8652008641a3eb3bc98e0225d2a80997c11b1465
 2012-10-20 19:05:12 -07:00
Joe Onorato
2e5d317c3b make packages respect LOCAL_ADDITIONAL_DEPENDENCIES 
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
 2012-10-20 18:13:57 -07:00
Joe Onorato
8858d2a731 Add a tool to let you enforce layering between packages in a java module. 
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
 2012-10-20 17:25:55 -07:00
Ying Wang
057eba07b8 Use PRIVATE_WARNINGS_ENABLE 
Before this LOCA_WARNINGS_ENABLE never worked :-(

Change-Id: I129a0bbbbb68e4179454b0827b0b0d18d6de67a0
 2012-10-18 10:54:49 -07:00
Joe Onorato
0eccce99d7 Add a tool to let you enforce layering between packages in a java module. 
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
 2012-10-18 10:21:46 -07:00
Stephen Hines
daf2ca50dd am d2637573: resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp 
* commit 'd26375733992298edc036652d25170e1cd7cbd49':
  Add support for building Filterscript files.
 2012-10-12 11:02:14 -07:00
Stephen Hines
0ab6e3e6e6 Add support for building Filterscript files. 
This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).

Bug: 7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
 2012-10-11 15:29:10 -07:00
Brian Carlstrom
6a68e77f51 Support LOCAL_ADDITIONAL_DEPENDENCIES for java 
Change-Id: Iac4b14b73e3c941b2d922e45f5698875c68134e1
 2012-09-28 10:13:30 -07:00
Ying Wang
3a6f7589e8 Add LOCAL_DONT_DELETE_JAR_META_INF 
To support to not delete META_INF directory from the static Java
libraries.

Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
 2012-08-30 12:59:42 -07:00
Ying Wang
245592908c Keep the emma classes if emma is enabled. 
Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
 2012-08-27 16:10:28 -07:00
Ying Wang
af4800c8a6 Support EMMA_INSTRUMENT in both full and unbundled builds. 
Bug: 6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
  unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
  unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
  LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
  non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
  and builds emma into apk/jar as static library, instead of using emma
  as part of shared library core.jar.

Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
 2012-08-22 12:11:01 -07:00
Guang Zhu
79f68bc925 Use new flag for emma instrumented build and limit to apps only 
Based on existing setup, when EMMA_INSTRUMENT is used on a full
build, all Java modules will be processed with emma instrument
unless otherwise marked in their own Makefiles.

For the purpose of collecting code coverage, emma-instrument
all Java modules aren't that useful, instead, instrumenting all
the app packages is more useful. This change adds a new flag
EMMA_FULL_APP_INSTRUMENT, which can be used with a full build
to instrument all app packages.

Change-Id: Ie143fed49c23402b21f6cccac2ef25741726be45
 2012-08-08 16:46:53 -07:00
Ying Wang
28437aac99 Add LOCAL_SOURCE_FILES_ALL_GENERATED support 
Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.

Bug: 6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
 2012-07-19 14:38:43 -07:00
Keun young Park
efe02ce9e0 add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK 
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
  supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
 2012-06-07 15:40:53 -07:00