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

21907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
dead54fc06 am 56bcf675: (-s ours) am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION." 
* commit '56bcf675976af65353b848bcfa34d671fa65d4ed':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
 2015-02-20 00:56:49 +00:00
Ying Wang
56bcf67597 am 564abd16: (-s ours) am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION." 
* commit '564abd1642fc3584a82d2737d053f9a50c5d0cae':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
 2015-02-20 00:50:10 +00:00
Ying Wang
564abd1642 am 0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION." 
* commit '0f672c6aad22dde39a172ae0b5f0b76068008f30':
  [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
 2015-02-20 00:46:40 +00:00
Ying Wang
0f672c6aad Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION." 2015-02-20 00:40:56 +00:00
Ying Wang
5bcc416d54 [DO NOT MERGE] Trim the AOSP PLATFORM_VERSION. 
With the long PLATFORM_VERSION, if you have also a long device/product
name and/or a long username, ro.build.fingerprint can easily exceed the
system property's length limit of 92 bytes.
This mitigates the risk a little bit.

Bug: 15593959
Change-Id: I9e316025227b30aa6887c9ce0065364fdbb9fc8f
 2015-02-20 00:34:35 +00:00
Bill Yi
5fb88bbca5 am b6cbd561: am 251412b4: Merge commit \'b89ec38113a22d09b0832ed2d3cb8fc413a14a75\' into HEAD 
* commit 'b6cbd561a93e47a3bd87c8fe9a828baddf0055bc':
 2015-02-20 00:30:43 +00:00
Bill Yi
b6cbd561a9 am 251412b4: Merge commit \'b89ec38113a22d09b0832ed2d3cb8fc413a14a75\' into HEAD 
* commit '251412b472c092616c3d54540495420267a8ac95':
 2015-02-20 00:22:52 +00:00
Bill Yi
251412b472 Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD 2015-02-19 14:30:26 -08:00
Yohann Roussel
5a8aa535be Merge "Allow global overriding LOCAL_JACK_ENABLED" 2015-02-19 17:49:44 +00:00
Yohann Roussel
80d41e0697 Merge "Enable jack multithreading" 2015-02-19 17:48:16 +00:00
Yohann Roussel
0f282ced6f Merge "Package dpi specific resources when Jack is enabled" 2015-02-19 14:53:17 +00:00
Yohann Roussel
b821391614 Allow global overriding LOCAL_JACK_ENABLED 
If the variable ANDROID_FORCE_JACK_ENABLED it will override any local
value.

Change-Id: I3fc99b97783dd3a89c3240a8a4269ebf9e477f3f
 2015-02-19 12:41:11 +01:00
Yohann Roussel
95573d5036 Enable jack multithreading 
Jack multithreading offer significant compile time improvement of
single project compilation and the problems it causes can be
avoided using "-j -l XX" instead of "-j YY" when running make.

Change-Id: I323f3d287467df1b598ceab6521cc71b329e0008
 2015-02-19 11:14:56 +01:00
Yohann Roussel
6ba8bd13cb Merge "Change built module of static java libraries" 2015-02-18 23:35:15 +00:00
Yohann Roussel
06744f60fc Package dpi specific resources when Jack is enabled 
Change-Id: I75995305359fe3870df61e67ba22c8d259342bf9
 2015-02-19 00:03:57 +01:00
Yohann Roussel
d2a76c14bf Change built module of static java libraries 
Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled
to classes.jack instead of javalib.jar.
This allows that running mm in those libraries will build classes.jack
instead of the jar.

Change-Id: I96b4b227848e971df96331b3f0cc731e856be349
 2015-02-18 22:54:18 +01:00
Dan Albert
f5ccd7b243 am 20ebefa8: am 0badfceb: Merge "Remove the unsets for removed gdbclient functions." 
* commit '20ebefa89989c910ed0cc560a62ea3b0777266db':
  Remove the unsets for removed gdbclient functions.
 2015-02-18 00:28:24 +00:00
Dan Albert
20ebefa899 am 0badfceb: Merge "Remove the unsets for removed gdbclient functions." 
* commit '0badfcebe71805a495d151ac4df48bb48940bde0':
  Remove the unsets for removed gdbclient functions.
 2015-02-17 21:13:24 +00:00
Dan Albert
0badfcebe7 Merge "Remove the unsets for removed gdbclient functions." 2015-02-17 21:01:19 +00:00
Elliott Hughes
1f382fa4f7 am 6f7b05bb: am 24374e57: Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER." 
* commit '6f7b05bbb8ef645f029dd3432b32c76a5b1ee3df':
  Remove ARCH_ARM_HAVE_TLS_REGISTER.
 2015-02-17 18:04:54 +00:00
Elliott Hughes
6f7b05bbb8 am 24374e57: Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER." 
* commit '24374e575285e1f7950293469bca7a3410e46fea':
  Remove ARCH_ARM_HAVE_TLS_REGISTER.
 2015-02-17 17:58:49 +00:00
Elliott Hughes
24374e5752 Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER." 2015-02-17 17:47:10 +00:00
Elliott Hughes
e033c6df7d Remove ARCH_ARM_HAVE_TLS_REGISTER. 
This was only needed for platform builds, and was removed in the gap between
armv5 being removed and being added back again for tapas builds. Otherwise it
would have been removed back then.

(I suspect that we don't need the system.prop file in here, either, but I
don't really know how to test that.)

Change-Id: I212ff7b3568b5d5ff3cc66150ec7c4fa0b8cac92
 2015-02-13 20:51:12 -08:00
Justin Harrison
d2d9747199 am b89ec381: am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 
* commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75':
  Revert "Allow system images larger than 2GiB."
 2015-02-13 20:44:23 +00:00
Justin Harrison
b89ec38113 am 070eea05: am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 
* commit '070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
  Revert "Allow system images larger than 2GiB."
 2015-02-13 20:37:10 +00:00
Justin Harrison
070eea05f2 am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 
* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
  Revert "Allow system images larger than 2GiB."
 2015-02-13 20:23:29 +00:00
Justin Harrison
ffd4fee911 Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4 Revert "Allow system images larger than 2GiB." 
This reverts commit cd082d4bfe.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
 2015-02-13 18:47:51 +00:00
Ying Wang
6368a18bb7 Merge "Load cts/build/config.mk after build/core/config.mk" 2015-02-13 18:33:49 +00:00
Ying Wang
bacf5f8008 Load cts/build/config.mk after build/core/config.mk 
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
 2015-02-13 10:28:40 -08:00
Miao Wang
8b24d3bced Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps." 2015-02-13 17:56:52 +00:00
Stuart Scott
4d88a3639b Merge "Split the build of the CTS infrastructure from the tests." 2015-02-13 17:26:20 +00:00
Jean-Philippe Lesot
5c938ffb33 Merge "Force make to check date of classes.jack after Jack run" 2015-02-13 01:09:09 +00:00
Miao Wang
c919b0ba88 [Renderscript] making librsjni.so be packed with apks when 
v8.renderscript is needed, even for bundled apps.

Bug: 19343399
Change-Id: I461e244be15e08d4525439bc042529314c84031e
 2015-02-12 17:07:31 -08:00
Ying Wang
1145b336f7 am 95627f6e: am a8b9a8c1: am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. 
* commit '95627f6e5434a8da33a99be72ae654e22a3b89f0':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
 2015-02-12 23:05:52 +00:00
Ying Wang
95627f6e54 am a8b9a8c1: am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. 
* commit 'a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
 2015-02-12 22:58:44 +00:00
Ying Wang
a8b9a8c1ed am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. 
* commit '1f58c41742b6a063138226e6483010486f56657f':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
 2015-02-12 22:46:54 +00:00
Ying Wang
1f58c41742 Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. 
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.

Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
(cherry picked from commit e66d7c1de0)
 2015-02-12 22:40:24 +00:00
Dan Albert
c2b6d3b32e am b5a3e2fe: am 8f1965ed: Merge "Remove gdbclient from envsetup." 
* commit 'b5a3e2fe9d85523f9e0ea3a0311ce7607b97a194':
  Remove gdbclient from envsetup.
 2015-02-12 21:36:33 +00:00
Dan Albert
b5a3e2fe9d am 8f1965ed: Merge "Remove gdbclient from envsetup." 
* commit '8f1965ed0152c1f93358e3a424e9156b29c56813':
  Remove gdbclient from envsetup.
 2015-02-12 21:12:36 +00:00
Dan Albert
8f1965ed01 Merge "Remove gdbclient from envsetup." 2015-02-12 21:02:49 +00:00
Ying Wang
5932b63cb9 am f5a6279c: am bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64." 
* commit 'f5a6279c4c13bcd77ac57c56c32df2f4139afa81':
  Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
 2015-02-12 20:18:18 +00:00
Ying Wang
f5a6279c4c am bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64." 
* commit 'bdfec89d96819cf78faa4a61635c2ec536b4545f':
  Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
 2015-02-12 20:11:19 +00:00
Ying Wang
bdfec89d96 Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64." 2015-02-12 19:58:40 +00:00
Dan Albert
617be5ede5 Remove the unsets for removed gdbclient functions. 
Change-Id: I6bb8b42dbc7ac45bec6b8267733f9b4d6212315f
 2015-02-12 11:30:06 -08:00
Dan Albert
f9631fd9db Remove gdbclient from envsetup. 
gdbclient is being promoted to a real script:
https://android-review.googlesource.com/#/c/131831/

Change-Id: I4bb70ad44cec0ebf62d9e8e355c22ed8b708868b
 2015-02-12 11:29:43 -08:00
Ying Wang
e66d7c1de0 Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. 
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.

Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
 2015-02-12 11:29:41 -08:00
JP Abgrall
69d8279048 am 92e0682f: resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp 
* commit '92e0682f05cafa5b67e2a1cfe7c5dd75db037db3':
  core: remove dependencies on genext2fs
 2015-02-12 17:27:04 +00:00
bohu
725dcdc395 am 05defc16: am d857abd1: am 151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev 
* commit '05defc16b6c8816ad18cf9a80ae9cc363fbf8ee4':
  Bump generic_mips and generic_x86_64 system partition size
 2015-02-12 04:45:57 +00:00
JP Abgrall
92e0682f05 resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp 
Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
 2015-02-11 20:05:03 -08:00