Commit Graph

13844 Commits

Author SHA1 Message Date
Ying Wang 0634a437a3 am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
* commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489':
  No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:42:57 -07:00
Ying Wang 3208b615c5 am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
* commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
  No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:34:09 -07:00
Ying Wang fc8b633851 resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
2013-08-15 12:02:30 -07:00
Ying Wang d65a7da320 am f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit 'f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
  No need to filter out AndroidConfig.h for unbundled build
2013-08-15 11:55:46 -07:00
Ying Wang f4723fa49b No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.

Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 11:01:10 -07:00
The Android Open Source Project 461cac9796 Reconcile with klp-release - do not merge
Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a
2013-08-14 14:44:03 -07:00
Vineeta Srivastava cc3fcd04f4 am 477b12b4: Fix missing camera from aosp builds.
* commit '477b12b45ad0c8e73aafe12e3056c051080c0de9':
  Fix missing camera from aosp builds.
2013-08-14 13:45:43 -07:00
Vineeta Srivastava 477b12b45a Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.

Bug: 10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
2013-08-14 13:29:33 -07:00
The Android Automerger 821ca8d814 "KRS45B" 2013-08-14 12:37:11 -07:00
The Android Open Source Project eb8e4d14d7 am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'f8fab17322ebc221fb493331c3a93b2d852704ae':
  "JWR66Y"
2013-08-14 12:19:43 -07:00
The Android Open Source Project f8fab17322 am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'fb2188d1390841285181256a0ec37c5558c971da':
  "JWR66Y"
2013-08-14 12:16:12 -07:00
The Android Open Source Project fb2188d139 Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
2013-08-14 12:06:41 -07:00
Ying Wang 7a43a0c105 am 66956dc0: am 396fd67d: am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '66956dc063351f30434da9b6bb62183b50996583':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:33:58 -07:00
Ying Wang 66956dc063 am 396fd67d: am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '396fd67d7a691a1226783f1b15442af86137eb3d':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:28:18 -07:00
Ying Wang 396fd67d7a am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit 'b9eee184f2ab291f5af6520c41f90a8857c4bd73':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:26:06 -07:00
Ying Wang b9eee184f2 am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit 'e391e7a86e806bd3d2549b6d12736166fafb746f':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:22:01 -07:00
The Android Automerger 5898118e52 "KRS45" 2013-08-14 06:08:19 -07:00
The Android Automerger dee88b6077 merge in klp-release history after reset to klp-dev 2013-08-14 06:04:55 -07:00
Ying Wang a02428e4f6 am 405dac7f: am 8f01a3c0: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
* commit '405dac7f000af3a02b374533f76a7f2eaedbc954':
  Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
2013-08-13 18:29:30 -07:00
Ying Wang 405dac7f00 am 8f01a3c0: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
* commit '8f01a3c0cadec174d0b54b06848037ecf20694d9':
  Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
2013-08-13 18:27:19 -07:00
Ying Wang 8f01a3c0ca Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT." 2013-08-14 01:25:06 +00:00
The Android Automerger 10db5208a0 "KRS44C" 2013-08-13 17:47:04 -07:00
Ying Wang e391e7a86e Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug: 10307364

Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
2013-08-13 17:40:24 -07:00
Elliott Hughes 32d315a399 Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Change-Id: Id7c0e77110653e618d783026cd4b4aeadb3c45ec
2013-08-13 17:05:34 -07:00
Santos Cordon ba304547fb am 883b1c4e: Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
* commit '883b1c4ee2ea71e542c8ab54aecc094806529304':
  The big switch.  Enabling InCallUi/Phone split by default.
2013-08-13 15:32:14 -07:00
The Android Automerger ec6101c2c9 "JWR66Y" 2013-08-13 15:20:55 -07:00
Santos Cordon 883b1c4ee2 Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev 2013-08-13 22:11:26 +00:00
Ying Wang 6d98d3b942 am a4ad06ac: am 750e0c08: Merge "Prepare upcoming GCC 4.8 release."
* commit 'a4ad06ac1db1dfc041fe386b76b22233fdc54341':
  Prepare upcoming GCC 4.8 release.
2013-08-13 15:03:24 -07:00
Ying Wang a4ad06ac1d am 750e0c08: Merge "Prepare upcoming GCC 4.8 release."
* commit '750e0c088271315b21741429aa124d7ba616fcc7':
  Prepare upcoming GCC 4.8 release.
2013-08-13 15:00:55 -07:00
Ying Wang 750e0c0882 Merge "Prepare upcoming GCC 4.8 release." 2013-08-13 21:59:27 +00:00
Ben Cheng aac3f81657 Prepare upcoming GCC 4.8 release.
o Add -Wno-unused-parameter -Wno-unused-but-set-parameter to suppress
  new warnings.
o Define GCC_COLORS to enable colorful diagnostic messages.

Change-Id: Icbd62300b0e6f39d4e514edec2431a06b4d72421
(cherry picked from internal commit ccd8e6082b)
2013-08-13 14:52:31 -07:00
Ying Wang 25d64bea75 am 285045bd: Support for LOCAL_HAL_STATIC_LIBRARIES
* commit '285045bd83548196aa3695423c6cd500ebe6d6c1':
  Support for LOCAL_HAL_STATIC_LIBRARIES
2013-08-13 14:41:55 -07:00
Ying Wang 285045bd83 Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.

Bug: 10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
2013-08-13 13:48:04 -07:00
The Android Automerger 43da5a76d6 "KRS44B" 2013-08-13 13:25:24 -07:00
Ying Wang 9039db6171 am 4c3a82fa: am 2863fa7a: Merge "FDO: support linux-x86 target"
* commit '4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
  FDO: support linux-x86 target
2013-08-13 10:48:41 -07:00
Ying Wang 4c3a82fa62 am 2863fa7a: Merge "FDO: support linux-x86 target"
* commit '2863fa7a9650fa6df38da61329e2f49d5233c3df':
  FDO: support linux-x86 target
2013-08-13 10:45:05 -07:00
Ying Wang 2863fa7a96 Merge "FDO: support linux-x86 target" 2013-08-13 17:38:36 +00:00
The Android Open Source Project d1bf91b409 am 5e1e791f: am 5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '5e1e791f3aaf6661ff4a21fe5b00f264057e862d':
  "JLS36B"
  JWR66X
  JSS15P
2013-08-13 10:14:02 -07:00
The Android Open Source Project 5e1e791f3a am 5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '5aac97cbfcb3f638805311ffe733e5bf6dc29747':
  "JLS36B"
  JWR66X
  JSS15P
2013-08-13 10:11:58 -07:00
The Android Open Source Project 5aac97cbfc Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
2013-08-13 10:09:56 -07:00
The Android Automerger 76169b514e "KRS44" 2013-08-13 06:07:27 -07:00
The Android Automerger e6f887b3f2 merge in klp-release history after reset to klp-dev 2013-08-13 06:00:55 -07:00
Santos Cordon 717764ea9c The big switch. Enabling InCallUi/Phone split by default.
.:::.   .:::.
                :::::::.:::::::
                :::::::::::::::
                ':::::::::::::'
                  ':::::::::'
                    ':::::'
                      ':'

          with love, from California

Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
2013-08-12 21:50:38 -07:00
The Android Automerger 17a989f7d6 "KRS43B" 2013-08-12 12:31:31 -07:00
The Android Automerger c78d0c6002 "KRS43" 2013-08-12 06:06:00 -07:00
The Android Automerger 73a96fd9b4 merge in klp-release history after reset to klp-dev 2013-08-12 06:00:44 -07:00
The Android Automerger 6cf02a6960 "KRS39E" 2013-08-10 12:08:48 -07:00
synergydev 6ecf0ef744 FDO: support linux-x86 target
Change-Id: I4a3a1d298176da109df316cf9128f19e77490bc9
2013-08-09 22:41:46 +00:00
Ying Wang 5a7a10411c am ad7fd29b: Don\'t bother going through the source tree
* commit 'ad7fd29b312bf588b2be3f799715f34ff8a6d46b':
  Don't bother going through the source tree
2013-08-09 15:22:04 -07:00
Ying Wang 6d805753d9 am 01c17f03: am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
* commit '01c17f031286691abeb157cd26ac1785757f07f0':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-08-09 13:38:43 -07:00