StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,907 Commits 1 Branch 0 Tags
dead54fc06c397b51d624eaf0a5f18f0205b91a0
Commit Graph

6592 Commits

Author SHA1 Message Date
Ying Wang
5778600fd0 am 11186695: am b45f7c35: am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit '111866953a95324b7ba342f92f14de2b7c35de24':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 20:16:12 +00:00
Ying Wang
ac0dbab7e6 am 9aad363e: am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11" 
* commit '9aad363e8d629d2ff56ccc30ac6bd95336d2d3c3':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
 2014-11-05 19:09:19 +00:00
Ying Wang
111866953a am b45f7c35: am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit 'b45f7c35b138c5b27f4c2528f7f699a59098809e':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 19:09:18 +00:00
Ying Wang
9aad363e8d am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11" 
* commit '7a301af1e0a3d590e42d3317940e65f739b9f930':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
 2014-11-05 19:01:48 +00:00
Ying Wang
b45f7c35b1 am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit '8683612fbd15640ae59daf7ba7c36e1f2ff8e687':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 19:01:47 +00:00
Ying Wang
7a301af1e0 Merge "Force colorsheme to SVG, since darkblue doesn't exist on X11" 2014-11-05 18:36:36 +00:00
Ying Wang
8683612fbd Merge "definitions.mk: look for definitions.mk in device/*/build also" 2014-11-05 17:50:00 +00:00
Stephen Hines
75ff9b8d10 am a729f618: am f1c5dd60: am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit 'a729f6187ab33dce008adc9965f33fd634db9efc':
  Use automatic color option with the latest clang.
 2014-11-04 17:57:14 +00:00
Stephen Hines
a729f6187a am f1c5dd60: am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit 'f1c5dd60b2d1721e8f5d974f89323eac09795d64':
  Use automatic color option with the latest clang.
 2014-11-04 17:51:26 +00:00
Stephen Hines
f1c5dd60b2 am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit '35e4ede5974053d05ae0f8791e60ba77a31907b3':
  Use automatic color option with the latest clang.
 2014-11-04 17:44:44 +00:00
Stephen Hines
c141b85ef1 Use automatic color option with the latest clang. 
Bug: 18187181

Now that I checked in the latest prebuilts, clang will automatically use
color on terminals and no color on redirection to files or non-terminals.

Change-Id: I9be00c44947946cc18ce59c936b7f45d0ce2b6fc
 2014-11-03 23:42:10 -08:00
Ying Wang
f4053c70e4 am 007026f0: am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev 
* commit '007026f0ebf2216d875b9fdab44cc68b659e2307':
  Add support for prebuilt AARs.
 2014-11-03 18:11:53 +00:00
Ying Wang
007026f0eb am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev 
* commit '3fe170c51ea1eca253164fa8738ab42b5b9aaa6b':
  Add support for prebuilt AARs.
 2014-11-03 18:07:45 +00:00
Nick Kralevich
0a5105bd25 am e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev 
* commit 'e4cbc2af5f476d9eb875253584260bed807acddf':
  Revert "Add support for prebuilt AARs."
 2014-11-02 16:53:29 +00:00
Ying Wang
e9dd9f2bfc Add support for prebuilt AARs. 
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
 2014-11-02 16:51:49 +00:00
Nick Kralevich
36fd476843 Revert "Add support for prebuilt AARs." 
master doesn't compile anymore.

This reverts commit f567292504.

Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
(cherry picked from commit bcf8683b29)
 2014-11-02 05:26:14 +00:00
Nick Kralevich
e4cbc2af5f Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev 2014-11-02 05:15:26 +00:00
Nick Kralevich
bcf8683b29 Revert "Add support for prebuilt AARs." 
master doesn't compile anymore.

This reverts commit f567292504.

Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
 2014-11-02 05:11:11 +00:00
Igor Murashkin
315fed1300 am 5ef20b40: am e1ab1b5e: am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit '5ef20b406ca6e25f01f56b750a3c9d249fc9eca8':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-11-01 00:37:10 +00:00
Igor Murashkin
5ef20b406c am e1ab1b5e: am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit 'e1ab1b5e47cd464d39e406b982b26dd755f2def6':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-11-01 00:33:07 +00:00
Igor Murashkin
e1ab1b5e47 am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit '4c93719e3010d39c212e73c975a27ec76d4c1fb0':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-10-31 22:44:15 +00:00
Ying Wang
5ba418c00a am be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev 
* commit 'be6a3db20b5d2242bc3b459c5b69b1d8ef86aa54':
  Introduce per-product per-module dex-preopt config
 2014-10-31 21:48:56 +00:00
Igor Murashkin
da9f1a7e82 core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files 
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.

This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.

Bug: 18035729
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
 2014-10-31 14:30:42 -07:00
Ying Wang
70d617aaf5 Introduce per-product per-module dex-preopt config 
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
(cherry picked from commit 20ebd2ef08)

Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878
 2014-10-31 10:12:54 -07:00
Ying Wang
df95d8c1f7 am 4ef8133a: am f5672925: Add support for prebuilt AARs. 
* commit '4ef8133a421dd92c6feb0508bc2274f12576cfd2':
  Add support for prebuilt AARs.
 2014-10-31 00:20:31 +00:00
Ying Wang
4ef8133a42 am f5672925: Add support for prebuilt AARs. 
* commit 'f56729250448200834c5c95c86c937e887d73623':
  Add support for prebuilt AARs.
 2014-10-31 00:13:50 +00:00
Ying Wang
5431ea2ce0 am 75a7d3a6: am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '75a7d3a620a7600bed6510a540514d15817046f3':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:50:34 +00:00
Ying Wang
75a7d3a620 am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '7f18adc240ca311d225ee9164e6d982f9a005d62':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:46:08 +00:00
Ying Wang
7f18adc240 am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '871b8df128b144f39d40889e463722a032c4d246':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:43:02 +00:00
Ying Wang
c7d1a973b0 Add -fcolor-diagnostics to global clang cflags. 
Bug: 18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
 2014-10-30 12:22:29 -07:00
Chih-hung Hsieh
a5d7970715 am 18340084: am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE." 
* commit '18340084172b98e44e44d994a2c326b2157c6c49':
  Revert "Continue to use march=i686 before fix of g++ ICE."
 2014-10-30 18:38:51 +00:00
Chih-hung Hsieh
1834008417 am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE." 
* commit '51e55c1d22576de38ca4b65deaded7b3a1af8387':
  Revert "Continue to use march=i686 before fix of g++ ICE."
 2014-10-30 16:08:20 +00:00
Chih-hung Hsieh
51e55c1d22 Revert "Continue to use march=i686 before fix of g++ ICE." 
This reverts commit f70f009ca8.

Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
 2014-10-30 01:55:45 +00:00
Ying Wang
f567292504 Add support for prebuilt AARs. 
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5
 2014-10-29 23:40:52 +00:00
Chih-Hung Hsieh
23103f4fa9 am f70f009c: Continue to use march=i686 before fix of g++ ICE. 
* commit 'f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
  Continue to use march=i686 before fix of g++ ICE.
 2014-10-29 22:07:26 +00:00
Chih-Hung Hsieh
f70f009ca8 Continue to use march=i686 before fix of g++ ICE. 
BUG: 18174291
BUG: 18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
 2014-10-29 14:46:15 -07:00
Chih-Hung Hsieh
5071eb750a Merge "Continue to use march=i686 before fix of g++ ICE." 2014-10-29 21:36:21 +00:00
Chih-Hung Hsieh
be971fc19b Continue to use march=i686 before fix of g++ ICE. 
BUG: 18174291
Change-Id: Idb76afd715b7b7049b9e47f92f2658f6923c8448
 2014-10-29 13:57:33 -07:00
Jeff Davidson
79ddea19f6 am 4e466096: am ed9981d9: am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '4e4660961b6c704d13c6c521f36958f436ec40f3':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 20:52:18 +00:00
Jeff Davidson
4e4660961b am ed9981d9: am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit 'ed9981d927cb24b106df9b3c350b6b63e570026f':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 20:42:11 +00:00
Ian Rogers
5f60710fc9 am c156f68c: am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit 'c156f68cffdbd4bfd0c064d99e9968c466bb7309':
  Specify -mcpu=krait for clang.
 2014-10-29 19:56:48 +00:00
Ian Rogers
c156f68cff am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit '508e27bfd7f470a945978c2b24403b0827dcde18':
  Specify -mcpu=krait for clang.
 2014-10-29 19:43:16 +00:00
Jeff Davidson
ed9981d927 am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 17:40:05 +00:00
Jeff Davidson
427d1e98ec Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 2014-10-29 17:35:17 +00:00
Neil Fuller
0333e90517 am 4b642748: am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support" 
* commit '4b642748dd41d8bd1f7a2c8de6e467a01cabae43':
  Add OpenJDK 8 experimental support
 2014-10-29 17:32:13 +00:00
Chih-Hung Hsieh
8179594a73 am 9fd84692: am 736a146c: am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS." 
* commit '9fd8469237cc2ac6487b64d6d300d7d2ec3f59ac':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
 2014-10-29 17:32:11 +00:00
Dan Albert
47bb921e00 am d905ec2a: am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order." 
* commit 'd905ec2ac6b1277d59b21b74f8632c34fdf1b9a9':
  Don't sort shared library link order.
 2014-10-29 17:32:10 +00:00
Chih-Hung Hsieh
66cca24a2c am 3b5261ac: am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott." 
* commit '3b5261ac75f7d8d912e92fcdfdd76534a9bbe41b':
  Raise x86 arch requirement to prescott.
 2014-10-29 17:32:09 +00:00
Neil Fuller
c6adac18fe am c5c60e2c: am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support" 
* commit 'c5c60e2c2af542294d38dc0e2284115a62dbb310':
  Remove Java 6 build support
 2014-10-29 17:32:08 +00:00
Neil Fuller
4b642748dd am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support" 
* commit 'acd65c7db0212bff2b7b1878a26b7a105522cd44':
  Add OpenJDK 8 experimental support
 2014-10-29 17:11:52 +00:00