StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,098 Commits 1 Branch 0 Tags
6a42a25429a3313f87c8ca5154c99c7acd0eccdf
Commit Graph

2951 Commits

Author SHA1 Message Date
Ying Wang
6a42a25429 Run e2fsck only when building images with the target files. 
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.

Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
 2013-02-27 13:54:02 -08:00
Ying Wang
6c86a133c7 Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES 
To disentangle the host/target shared library dependencies.

Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
 2013-02-25 18:12:11 -08:00
Ying Wang
f7084ca921 Run zipalign after classes.dex is removed from the apk 
If LOCAL_DEX_PREOPT is enabled.

Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
 2013-02-25 16:58:05 -08:00
Ying Wang
48b6e18f1f Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev 2013-02-26 00:19:04 +00: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
Jean-Baptiste Queru
4dbbd8a37e am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK." 
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
  Fixed error message for using OpenJDK.
 2013-02-25 21:21:03 +00:00
Tim Roes
304f5194fd Fixed error message for using OpenJDK. 
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".

Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
 2013-02-23 20:25:00 +01:00
Ying Wang
50e52fa11e Don't run cleanspecs if you are using mm/mmm. 
There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.

Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
 2013-02-22 18:15:29 -08:00
Ying Wang
9485a57bb2 Untwist the target/host shared library dependencies. 
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.

Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
 2013-02-22 14:32:30 -08:00
Ying Wang
00b2811e66 resolved conflicts for merge of 40ab92d0 to master 
Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
 2013-02-22 11:02:03 -08:00
Ying Wang
b303d5d7d4 Merge "[MIPS] Update build rules" 2013-02-22 18:03:15 +00:00
Ying Wang
514cc4d25e We shouldn't use temporary variable in the build recipe. 
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
 2013-02-22 10:01:33 -08:00
Ying Wang
e5d6d900c2 Merge "We shouldn't use temporary variable in the build recipe." 2013-02-22 18:00:56 +00:00
Ying Wang
b8a256a1fa We shouldn't use temporary variable in the build recipe. 
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
 2013-02-22 09:59:17 -08:00
Ken Sumrall
14c63cf678 Merge "Start producing target files using the unified fstab." 2013-02-22 06:23:02 +00:00
Ying Wang
3126831621 Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT 
Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by
default. You can set it in your .bashrc or buildspec.mk.

Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
 2013-02-21 18:42:28 -08:00
Ken Sumrall
31ce31f607 Start producing target files using the unified fstab. 
Change-Id: I6d9783fba3fcb4617323071bf924f50b66ad6935
 2013-02-21 16:27:25 -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
Ying Wang
b9a4e1eeea Merge "Use BUILD_PREBUILT to install the cmds." 2013-02-20 01:15:31 +00:00
Chris Dearman
6cc0c334fc [MIPS] Update build rules 
Add  -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections

Some other cleanups to reduce differences between ARM and MIPS config files

Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
 2013-02-19 17:04:57 -08:00
Ying Wang
d3aab738de Use BUILD_PREBUILT to install the cmds. 
Change-Id: Idd7308d653653387ee3ff4384ee428bc3c663c8b
 2013-02-19 16:43:12 -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
Ying Wang
5938039677 am 7ce7473f: am 5e12e60b: Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang." 
* commit '7ce7473f866fc5356291f38a3437a071ea5fd00d':
  For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
 2013-02-15 14:48:01 -08:00
Ying Wang
5e12e60b47 Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang." 2013-02-15 19:33:59 +00:00
Elliott Hughes
b2bbff7cba am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags." 
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
  Remove more always-true ARCH_ARM_HAVE_ flags.
 2013-02-14 17:31:40 -08:00
Elliott Hughes
03d2aa4dd0 Remove more always-true ARCH_ARM_HAVE_ flags. 
All the remaining flags appear to be actually used.

Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
 2013-02-14 12:04:48 -08:00
Elliott Hughes
14a2d978df am d0fb6930: am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS." 
# Via Android Git Automerger (1) and others
* commit 'd0fb693024b88a713fe95296db451a0e6c17ec66':
  Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
 2013-02-13 17:11:36 -08:00
Elliott Hughes
d0542498a0 Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS. 
Because every ARM architecture we've ever supported has had both.

Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
 2013-02-13 16:44:21 -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
59c8b6d122 Merge "Dont' write out the clean_steps.mk if" 2013-02-13 19:58:23 +00:00
Ying Wang
4a2f173339 Dont' write out the clean_steps.mk if 
If this is mm/mmm and there is no pre-existing clean_steps.mk.
Otherwise, the build system will run almost all the clean steps in the
sourcet tree if you do a full build next.

Change-Id: I5fe1e99c4f09629e4455319ea664cfba4ac634ea
 2013-02-13 11:57:45 -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
Ying Wang
32cca7eab4 Merge "Allow user to override the linux host toolchain." 2013-02-12 22:14:02 +00:00
Ying Wang
90397c1029 Add deps on LOCAL_SHARED_LIBRARIES for prebuilts. 
This is necessary for prebuilt build cache to work properly.

Change-Id: Ica28ce4d245a948142e067d82ff84ce1aef2134e
 2013-02-12 12:28:45 -08:00
Ying Wang
79e3f77996 Allow user to override the linux host toolchain. 
Bug: 8181840
Change-Id: Ib2a90d33414758e95b1a3c60db62c4188944dfdd
 2013-02-12 11:48:37 -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
Ying Wang
bfa5fb145f Merge "mma and mmma" 2013-02-12 01:52:10 +00: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
Shih-wei Liao
48725b8384 Merge "Build RS compatibility library apps with libcompiler_rt.so too." 2013-02-11 18:01:17 +00:00
Shih-wei Liao
f3f8ea8678 Merge "Fix libcompiler-rt. Use the official name libcompiler_rt." 2013-02-11 17:48:46 +00:00
Ying Wang
b607f7bd4c mma and mmma 
augmented mm/mmm:
Their usages are the same as mm/mmm.
They build not only all modules in given path(s), but also their
dependencies.
With them, to run mm/mmm you don't need to run a full build first now:
Just run mma/mmma first.
Note that mma/mmma need to load all the makefiles in the source tree
so they are much slower than mm/mmm.
You should run mma/mmma the first time, and then mm/mmm for
incremental build.

Bug: 8163814
Change-Id: I554a97c0a23343b65c50870406225eb0064e0651
 2013-02-08 18:13:15 -08:00
Dirk Dougherty
9d38ec786d am 54096df3: am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '54096df340b52254b8fe873d43f4de76806b788b':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:33:09 -08:00
Dirk Dougherty
54096df340 am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:30:26 -08:00
Dirk Dougherty
1f7c3cb3c2 am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '061c758cfa5409035854804efa1e0c4d32d2f007':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:27:11 -08:00
Dirk Dougherty
061c758cfa am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:22:04 -08:00
Dirk Dougherty
9fdf671d7f Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
 2013-02-08 15:45:45 -08:00
Raghu Gandham
695fee31ad For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option 
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.

Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
 2013-02-07 16:07:01 -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