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

10076 Commits

Author SHA1 Message Date
Evgeniy Stepanov e1d27e210f Split out ASFLAGS from CFLAGS in Clang config. 
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
 2012-08-28 10:08:24 -07:00
Chris Wren ab42a8341c am 00743e38: am 07791f87: Merge "Include stock Dreams in the build." into jb-mr1-dev 
* commit '00743e38849df7fbc5d6a723bbd5e79658941b69':
  Include stock Dreams in the build.
 2012-08-28 07:13:29 -07:00
Chris Wren 00743e3884 am 07791f87: Merge "Include stock Dreams in the build." into jb-mr1-dev 
* commit '07791f870e8af381cef7ba7048bf5b1cf7b7ca9c':
  Include stock Dreams in the build.
 2012-08-28 07:11:34 -07:00
Chris Wren 07791f870e Merge "Include stock Dreams in the build." into jb-mr1-dev 2012-08-28 07:09:46 -07:00
Ying Wang 8cd3113ee8 am 94aa427b: am 24559290: Keep the emma classes if emma is enabled. 
* commit '94aa427bc0c2893738e8d12f041f68490515517f':
  Keep the emma classes if emma is enabled.
 2012-08-27 16:21:28 -07:00
Ying Wang 94aa427bc0 am 24559290: Keep the emma classes if emma is enabled. 
* commit '245592908c5be4c841ce7a93cf0c8e9e6a8e5965':
  Keep the emma classes if emma is enabled.
 2012-08-27 16:19:29 -07: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 3899d6a20c am 1035fe5c: am cb616cf7: Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev 
* commit '1035fe5c1b0e170a0500b44879d0185402090a5d':
  Automatically add Java resources carried by static Java libraries.
 2012-08-27 15:29:46 -07:00
Ying Wang 1035fe5c1b am cb616cf7: Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev 
* commit 'cb616cf73671028708c22bf76e47af515d12f485':
  Automatically add Java resources carried by static Java libraries.
 2012-08-27 15:28:11 -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 40b95c1e10 am 7e7c1a07: (-s ours) am c1c571ec: am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '7e7c1a071f994e6ae5e3e45db2c014927676ee46':
  JRO03U
  JRO03T
  JZO54
 2012-08-27 15:20:28 -07:00
The Android Open Source Project 7e7c1a071f am c1c571ec: am 28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit 'c1c571ecbf9efe17dbab103d408007e83d94820f':
  JRO03U
  JRO03T
  JZO54
 2012-08-27 15:17:11 -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
Chiao Cheng 3c1527ecc7 Merge "Adding new dialer application to core." 2012-08-27 13:57:41 -07:00
Chiao Cheng 1703f31db6 Adding new dialer application to core. 
Bug: 6993891
Change-Id: I992d2da9a9468a803b45d956f7df16a741162787
 2012-08-27 13:44:56 -07:00
Chris Wren 74931cd5c4 Include stock Dreams in the build. 
Change-Id: I61953eeb50f8f02845468bc11c723405d5641d7f
 2012-08-27 16:39:56 -04:00
The Android Automerger 75874cac14 JRO03U 2012-08-27 12:52:54 -07:00
Ben Cheng 50ad303126 am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 
* commit '0419b446598f0c3cbf46ef2f2973e043338ac988':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
 2012-08-27 12:32:32 -07:00
Ben Cheng 0419b44659 am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 
* commit '4df0782b3adfd03c167111790fdf5a9de676080c':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
 2012-08-27 12:30:36 -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 Open Source Project 3b31ef7a35 am ff1da09d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'ff1da09d3b83e9e821bc51442905771a136dbca1':
  JOO54E
  JOO54D
  JOO54C
  JOO54B
  JOO54
 2012-08-25 07:16:48 -07:00
The Android Open Source Project ff1da09d3b Reconcile with jb-mr1-release - do not merge 
Change-Id: I65271947f0e7aef323f59617db1bb1a6744bf31e
 2012-08-25 07:15:30 -07:00
Jean-Baptiste Queru a02f5b9463 am 5cbda9a8: am 414d7e85: am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '5cbda9a80c23125ac1fa7d722d948fd59a79f793':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 14:19:18 -07:00
The Android Automerger bf687f8464 JRO03T 2012-08-24 13:23:58 -07:00
Jean-Baptiste Queru 5cbda9a80c am 414d7e85: am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '414d7e859a93266c6069d33badd20b9061052806':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 13:09:22 -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
The Android Automerger 66679a1c2f JOO54E 2012-08-24 10:32:57 -07:00
Ying Wang dceb47f2e2 am 4084c112: am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev 
* commit '4084c112e5d073bd0d6875c45939ed7fba62ed14':
  Filter out the overridden packages before doing required module expansion.
 2012-08-24 09:55:05 -07:00
Ying Wang 4084c112e5 am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev 
* commit '2d39468bee1b2ab1f26e8da9cc0849cab86349ad':
  Filter out the overridden packages before doing required module expansion.
 2012-08-24 09:53:47 -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 8175d1aeb0 am d163c8ed: am 781a83ae: am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file" 
* commit 'd163c8eda25ff1c2e4de5a981331ab7e77aaeea1':
  Fix reporting wrong error message for zipalign output file
 2012-08-24 07:38:50 -07:00
Jean-Baptiste Queru d163c8eda2 am 781a83ae: am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file" 
* commit '781a83ae1261520d65a0f2a714c06bd1ac1917b7':
  Fix reporting wrong error message for zipalign output file
 2012-08-24 07:36:50 -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 f8863ca65c JOO54D 2012-08-24 01:19:29 -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
The Android Automerger 7e91484467 JOO54C 2012-08-23 17:52:52 -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
The Android Automerger 7f55e08193 JOO54B 2012-08-23 14:19:08 -07:00
Victoria Lease 0d4c0642ec am 6a36e75d: am f8c154f4: Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev 
* commit '6a36e75d63869f8adcd72c43364318118c3715f5':
  getsdcardpath, getscreenshotpath, getlastscreenshot
 2012-08-23 12:01:25 -07:00
Victoria Lease 6a36e75d63 am f8c154f4: Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev 
* commit 'f8c154f4b0b402968a911bf2c00ea40d252ccb60':
  getsdcardpath, getscreenshotpath, getlastscreenshot
 2012-08-23 11:59:32 -07:00
Victoria Lease f8c154f4b0 Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev 2012-08-23 11:58:01 -07:00
The Android Automerger c30c425d4d JOO54 2012-08-23 06:35:16 -07:00