p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,782 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

9782 Commits

Author SHA1 Message Date
Daniel Sandler ce9ecf38e9 Merge "Add basic Dreams set to builds." into jb-mr1-dev 2012-08-31 13:34:38 -07:00
Daniel Sandler eeed3cf2c5 Add basic Dreams set to builds. 
Change-Id: I7b7e84a84f9fc6c594662baf4dd991ff9af5f162
 2012-08-31 15:57:09 -04: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
Kenny Root 565de5c97c am a4f2f34a: am d6a46969: Add make_ext4fs to all builds 
* commit 'a4f2f34a45a35c5c49308d336b822ea4af4a543d':
  Add make_ext4fs to all builds
 2012-08-30 12:13:56 -07:00
Kenny Root a4f2f34a45 am d6a46969: Add make_ext4fs to all builds 
* commit 'd6a469693fe77884bc902d6ec8be6f04d7d8e21a':
  Add make_ext4fs to all builds
 2012-08-30 12:11:40 -07:00
Jean-Baptiste Queru 780364f0cb am 9993b126: am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card" 
* commit '9993b1265ec108957c1b4a35bdc62940a350b3e4':
  Add make_ext4fs to support installing apps to SD card
 2012-08-30 11:44:17 -07:00
Jean-Baptiste Queru 9993b1265e am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card" 
* commit 'bb369a582b9756347959f6ef389507455f805df1':
  Add make_ext4fs to support installing apps to SD card
 2012-08-30 11:40:13 -07:00
Jean-Baptiste Queru bb369a582b Merge "Add make_ext4fs to support installing apps to SD card" 2012-08-30 11:01:29 -07:00
Jun Tian 536c8bed37 Add make_ext4fs to support installing apps to SD card 
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.

Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
 2012-08-30 09:53:03 -07:00
Kenny Root d6a469693f Add make_ext4fs to all builds 
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.

(cherry-pick of 720479ea7e)

Bug: 6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
 2012-08-30 09:08:27 -07: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 c8d107740f am fe95bc0f: am 1d0f5f91: Merge "Include all standard shared library paths in /system/lib" 
* commit 'fe95bc0fd6bf5c45e264740654ee4ad45fcb37d4':
  Include all standard shared library paths in /system/lib
 2012-08-28 13:41:08 -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 fe95bc0fd6 am 1d0f5f91: Merge "Include all standard shared library paths in /system/lib" 
* commit '1d0f5f914ae1406b976f69c265f0042c0279974e':
  Include all standard shared library paths in /system/lib
 2012-08-28 13:16:58 -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
Jean-Baptiste Queru 1d0f5f914a Merge "Include all standard shared library paths in /system/lib" 2012-08-28 12:46:43 -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
Chris Wren 07791f870e Merge "Include stock Dreams in the build." into jb-mr1-dev 2012-08-28 07:09:46 -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 cb616cf736 Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev 2012-08-27 15:25:12 -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
The Android Open Source Project c1c571ecbf am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '28f37bb992853a877980ea0d1040df2e46ee71c1':
  JRO03U
  JRO03T
  JZO54
 2012-08-27 15:13:12 -07:00
The Android Open Source Project 28f37bb992 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
 2012-08-27 14:10:49 -07:00
Chris Wren 74931cd5c4 Include stock Dreams in the build. 
Change-Id: I61953eeb50f8f02845468bc11c723405d5641d7f
 2012-08-27 16:39:56 -04:00
Chris Dearman 6858d51a03 Include all standard shared library paths in /system/lib 
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
 2012-08-27 12:57:04 -07:00
The Android Automerger 75874cac14 JRO03U 2012-08-27 12:52:54 -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
The Android Automerger bf687f8464 JRO03T 2012-08-24 13:23:58 -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 2d39468bee Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev 2012-08-24 09:52:19 -07:00
Jean-Baptiste Queru 781a83ae12 am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file" 
* commit '83af736f28c03bcac552f83bc645433925135c7e':
  Fix reporting wrong error message for zipalign output file
 2012-08-24 07:30:00 -07:00
The Android Automerger 0bd5415fa0 JZO54 2012-08-23 21:31:01 -07:00
The Android Automerger 59492596c9 merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:08 -07:00
Jean-Baptiste Queru 83af736f28 am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file" 
* commit '5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
  Fix reporting wrong error message for zipalign output file
 2012-08-23 15:09:15 -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
Jean-Baptiste Queru 5ac65f8696 Merge "Fix reporting wrong error message for zipalign output file" 2012-08-23 14:52:41 -07:00
Victoria Lease f8c154f4b0 Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev 2012-08-23 11:58:01 -07:00
Ying Wang 685ae6dc36 Merge "Allow target arch in tapas parameters." into jb-mr1-dev 2012-08-22 18:27:09 -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
Paul Westbrook 6392aeeadb Remove imap2 from build 
Change-Id: I64b5db47895e99f76d30e453f4d95c9546a96839
 2012-08-22 14:49:58 -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
Ying Wang 67f0292011 Allow target arch in tapas parameters. 
For example:
$ tapas App1 App2 x86 userdebug

Change-Id: I19601a93484f70dac677d2d68033684db32e1321
 2012-08-22 10:46:21 -07:00