StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,158 Commits 1 Branch 0 Tags
35a6b4fb65b17fbc698fbd0796eee89b7a06c5e9
Commit Graph

2718 Commits

Author SHA1 Message Date
Ying Wang
6a6723a0a9 am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." 
* commit '4458452ef64f271906914e79ffd9923630ae22f2':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
 2012-09-11 12:12:23 -07:00
Ying Wang
6adcf0180a android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-09-11 11:47:22 -07:00
Ying Wang
5586106944 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args
 2012-09-10 10:25:41 -07:00
Ying Wang
410420ed66 am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args
 2012-09-10 10:21:57 -07:00
Ying Wang
c23f4efdbb Add transform-d-to-p-args 
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug: 7127743

Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
 2012-09-07 17:04:06 -07:00
Ying Wang
7676611415 am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:39:55 -07:00
Ying Wang
0ee362ea04 am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:35:50 -07:00
Ying Wang
619fccf9f3 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES 
Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
 2012-09-05 18:09:49 -07:00
Doug Zongker
1a09726f68 fix possible build break 
If you try to build a recovery image without having built the main
system, creating the recovery resourc file can fail due to the
directory not existing.

Change-Id: I2daff847c0b58dfa519d0f742636f01dba28c689
 2012-09-04 14:45:11 -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
Andrew Hsieh
c2fb2391f4 Enable stack-protector for x86 
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
 2012-08-29 15:13:23 +08:00
Jean-Baptiste Queru
d4ace13802 am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
  Add pattern to check for GCC 4.6
 2012-08-28 13:41:09 -07:00
Jean-Baptiste Queru
d5096c6a5c resolved conflicts for merge of 5c903372 to jb-mr1-dev 
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
 2012-08-28 13:40:19 -07:00
Jean-Baptiste Queru
4dc6ed96a0 am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
  Add pattern to check for GCC 4.6
 2012-08-28 13:16:59 -07:00
Jean-Baptiste Queru
5c90337229 am 9e2b4718: Merge "Use gold linker on x86" 
* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
  Use gold linker on x86
 2012-08-28 13:16:57 -07:00
Jean-Baptiste Queru
9eb87b8d20 Merge "Add pattern to check for GCC 4.6" 2012-08-28 12:47:34 -07:00
Ying Wang
6f4de4bd13 Allow Java resource in apk. 
Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
 2012-08-28 12:37:27 -07:00
Jean-Baptiste Queru
9e2b4718a0 Merge "Use gold linker on x86" 2012-08-28 12:27:21 -07:00
Pavel Chupin
b205b46153 Use gold linker on x86 
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.

Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2012-08-28 13:10:18 +04:00
Andrew Hsieh
26c7805781 Add pattern to check for GCC 4.6 
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.

Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
 2012-08-28 10:49:05 +08: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
3e500c6356 Automatically add Java resources carried by static Java libraries. 
Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

	core/package.mk
 2012-08-27 15:21:51 -07:00
Ben Cheng
4df0782b3a Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 2012-08-27 12:27:37 -07:00
Ben Cheng
cc4822682e Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests. 
Bug 7050760

Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
 2012-08-27 12:20:36 -07:00
Jean-Baptiste Queru
414d7e859a am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit 'dbf6ad0692f98cacf27dc023854b2c5a5575a841':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 13:06:42 -07:00
Jean-Baptiste Queru
dbf6ad0692 am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '713bac96d628d6ca040fb1fe5d7a8abdcb932553':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 13:04:48 -07:00
Jean-Baptiste Queru
713bac96d6 Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 2012-08-24 13:00:10 -07:00
Ying Wang
489458fa31 Filter out the overridden packages before doing required module expansion. 
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
 2012-08-23 15:08:34 -07:00
Ying Wang
c3a4cfe9b5 Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev 2012-08-22 15:19: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
Jean-Baptiste Queru
cd9668edd4 am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit 'e3479ea5033e2ede36f6f771dd3a6ea315505efd':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 09:57:30 -07:00
Jean-Baptiste Queru
e3479ea503 am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 09:55:25 -07:00
Jean-Baptiste Queru
15012c115d Merge "Build on Mac OS X : add experimental SDK versions" 2012-08-22 09:44:48 -07:00
Ying Wang
b3f83098ef Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev 2012-08-21 13:45:38 -07:00
Andrew Hsieh
cd3050c541 am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib" 
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
  Added BUILD_HOST_static to build statically linked executable/shared-lib
 2012-08-21 12:58:45 -07:00
Ying Wang
02d75da447 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-08-21 11:54:49 -07:00
SangWook Han
691e0243ca Build on Mac OS X : add experimental SDK versions 
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
 2012-08-22 02:59:58 +09:00
Keun young Park
02a2f848b6 change target to androideabi 
- it should be androideabi instead of android
  external/llvm/lib/Support/Triple.cpp

Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
 2012-08-21 10:20:18 -07:00
Ard Biesheuvel
6c1f9ccfb1 ARM: put crtbegin_so.o at the beginning where it belongs 
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
 2012-08-21 10:42:32 +02:00
Andrew Hsieh
31ef1037bf Added BUILD_HOST_static to build statically linked executable/shared-lib 
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
 2012-08-21 14:40:16 +08:00
Doug Zongker
85e86626e9 Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev 2012-08-20 15:47:07 -07:00
Doug Zongker
565888726b include recovery-resource.dat in /system/etc 
Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.

Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
 2012-08-20 15:38:58 -07:00
Keun young Park
397d2edbb9 Merge "add CLANG configurations for MIPS" into jb-mr1-dev 2012-08-20 09:36:11 -07:00
Andreas Makris
ce7731af9f Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building 
This patch adds BOARD_CUSTOM_BOOTIMG_MK. It is needed for some devices like
Sony Xperia S (LT26) because it needs a own bootimg format.
If BOARD_CUSTOM_BOOTIMG_MK is not set the build will be done in the normal
way, so other devices are not affected.

Change-Id: I66c8be6b107988d3238001e1dc612c044ed01aaa
Signed-off-by: Andreas Makris <andreas.makris@gmail.com>
 2012-08-18 18:36:11 +02:00
Joe Onorato
5ad1d7ec00 am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional"" 
* commit '726d921a47cb1003bcf7ff84ae1d332dec86d674':
  Install all host modules.  Don't filter out ones tagged "optional"
 2012-08-17 05:46:29 -07:00
Joe Onorato
726d921a47 am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional"" 
* commit '45cd00cd9e2feec187a6253b95e866cd10dfa20a':
  Install all host modules.  Don't filter out ones tagged "optional"
 2012-08-17 05:43:43 -07:00
Joe Onorato
45cd00cd9e Merge "Install all host modules. Don't filter out ones tagged "optional"" 2012-08-17 05:36:21 -07:00
Joe Onorato
68559da02f Install all host modules. Don't filter out ones tagged "optional" 
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
 2012-08-17 05:35:23 -07:00
Joe Onorato
b68c3f9ca5 am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit '763c080198655782cc5700d6f53cce330ab7e008':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 05:08:36 -07:00
Joe Onorato
763c080198 am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit '687bde38891b6aa3796f52721d7498436ab45330':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 04:34:06 -07:00