Commit Graph

13861 Commits

Author SHA1 Message Date
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
Ying Wang 43e3a9de0e am 5a7a1041: am ad7fd29b: Don\'t bother going through the source tree
* commit '5a7a10411c9769dcd1f5ac2c6947cccb28424a50':
  Don't bother going through the source tree
2013-08-09 15:54:17 -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 de9b8866bc am 6d805753: am 01c17f03: am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
* commit '6d805753d9c9bc755280fdc05e0bcdf3fcee2f00':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-08-09 13:41:23 -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
Ying Wang 01c17f0312 am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
* commit 'e58868ab47fc044e9e7985c8357d83fee4df732a':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
2013-08-09 13:36:25 -07:00
Ying Wang e58868ab47 Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 2013-08-09 20:33:11 +00:00
Doug Zongker bbd6073430 fix sign_target_files_apks on non-user builds
Not that these should ever be signed, but still, it shouldn't crash.

Change-Id: I2b837e2c77f6e81743f93c96f361fc187b4fb82b
2013-08-09 13:20:36 -07:00
Ying Wang afd15966d2 am 412bc232: am 0a7e26e2: am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit '412bc2329f788bbbc28e198cec45c82bd2fa0a50':
  Modify release tools to replace certs in MMAC files.
2013-08-09 12:48:29 -07:00
Ying Wang e9614a49ff am 0790dcfd: am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"
* commit '0790dcfd3b52a16dccc118577bf154c83162bec1':
  FDO: do not support host modules
2013-08-09 12:48:28 -07:00
Ying Wang 412bc2329f am 0a7e26e2: am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit '0a7e26e29dfb5efbb008ced7509931e5e5eb4d71':
  Modify release tools to replace certs in MMAC files.
2013-08-09 12:47:17 -07:00
Ying Wang 0790dcfd3b am 2e45116d: am 515e0465: Merge "FDO: do not support host modules"
* commit '2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
  FDO: do not support host modules
2013-08-09 12:47:16 -07:00
Ying Wang 0a7e26e29d am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit 'a3f69c933430e5117b5e37e786487abd3a3488ce':
  Modify release tools to replace certs in MMAC files.
2013-08-09 12:45:01 -07:00
Ying Wang 2e45116d3a am 515e0465: Merge "FDO: do not support host modules"
* commit '515e0465d169905e7e454207f3cbb2a57a033ae1':
  FDO: do not support host modules
2013-08-09 12:45:00 -07:00
Ying Wang a3f69c9334 Merge "Modify release tools to replace certs in MMAC files." 2013-08-09 19:42:09 +00:00
Ying Wang ad7fd29b31 Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.

Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
2013-08-09 10:08:30 -07:00
The Android Automerger b077f36bc6 "KRS39D" 2013-08-09 09:57:42 -07:00
Robert Craig 817c574d75 Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.

Change-Id: Id0e945b0d62720c41f5ca9764a00de4bcdecaab4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-08-09 07:20:52 -04:00
The Android Automerger 0f7865d3ac KRS39C 2013-08-08 17:57:14 -07:00
The Android Automerger ee676f508a "JLS36B" 2013-08-08 16:53:41 -07:00
The Android Open Source Project 8319d0cee7 am d0ec3286: (-s ours) am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit 'd0ec3286e7d2d2d0fa6643d8d59c956cd46decb1':
2013-08-08 16:12:47 -07:00
The Android Automerger 253e7127e9 am c618d4f1: Fix klp-dev build file
* commit 'c618d4f1008991ec6fe3d89adb83091e6d7cef73':
  Fix klp-dev build file
2013-08-08 16:12:41 -07:00
The Android Automerger ae75d2fd74 am 2a516ccc: "KRS39B"
* commit '2a516ccce5b58515191cd0b55da9df6e4838589e':
  "KRS39B"
2013-08-08 16:12:41 -07:00
The Android Automerger ae5df2f1ed am 67d10b46: merge in klp-dev history after reset to master
* commit '67d10b46e3cb26703abc5312930adf79b1ad634c':
  Fix dev branch Build ID
  "KRS38B"
2013-08-08 16:12:40 -07:00
The Android Automerger 188c814c83 "KRS39B" 2013-08-08 15:02:26 -07:00
The Android Open Source Project d0ec3286e7 am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit 'f66a269fa4300fa691348bdd55a2a16ff55de608':
  JWR66W
  JSS15O
  JLS36
  JSS15N
  "JSS15M"
  "JSS15L"
  "JSS15K"
2013-08-08 14:14:13 -07:00
Ying Wang 515e0465d1 Merge "FDO: do not support host modules" 2013-08-08 18:54:20 +00:00
The Android Automerger 09f063e216 "KRS39" 2013-08-08 07:55:42 -07:00
The Android Automerger e2c150d15b merge in klp-release history after reset to klp-dev 2013-08-08 07:53:12 -07:00
The Android Automerger c618d4f100 Fix klp-dev build file 2013-08-08 07:47:58 -07:00
The Android Automerger 2a516ccce5 "KRS39B" 2013-08-08 07:39:23 -07:00
The Android Automerger 67d10b46e3 merge in klp-dev history after reset to master 2013-08-08 07:37:17 -07:00
The Android Open Source Project f795dd4498 am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit 'f66a269fa4300fa691348bdd55a2a16ff55de608':
  JWR66W
  JSS15O
  JLS36
  JSS15N
  "JSS15M"
  "JSS15L"
  "JSS15K"
2013-08-08 06:36:54 -07:00
synergydev cfdb24f1cb Link PRIVATE_TARGET_FDO_LIB before shared libraries
For global declaration of FDO profile generation and usage,
we need to link PRIVATE_TARGET_FDO_LIB (libgcov.a by default)
prior to linking shared libraries.

TARGET_FDO_LIB is set if feedback directed optimizations
are in use, so we do not need to worry about consistent size
increases from this change.

Change-Id: I543903f58893816f037c9466f31b19dfe822fdf4
2013-08-08 05:31:12 -07:00
Jason Monk 89fa610033 Merge "Add libpac, pacserver, and ProxyHandler to build." 2013-08-08 02:41:29 +00:00
Jason Monk b5e2c29dba Add libpac, pacserver, and ProxyHandler to build.
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.

bug:10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
2013-08-08 01:39:10 +00:00
The Android Automerger 1c64e0cfe7 "KRS38B" 2013-08-07 16:28:09 -07:00
The Android Automerger 0f3842a028 JWR66X 2013-08-07 16:10:36 -07:00
The Android Automerger 57b607b4e9 JSS15P 2013-08-07 16:02:33 -07:00
The Android Open Source Project f66a269fa4 Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
2013-08-07 09:42:55 -07:00
The Android Automerger 95de125300 Fix dev branch Build ID 2013-08-07 09:23:00 -07:00
The Android Automerger e1ae2366b7 "KRS38B" 2013-08-07 09:16:08 -07:00
The Android Automerger 1994ecb7de "KRS38" 2013-08-07 06:02:09 -07:00
The Android Automerger e2346da0e3 merge in klp-release history after reset to master 2013-08-07 06:00:15 -07:00
The Android Automerger 0cc007a161 JWR66W 2013-08-06 20:33:52 -07:00
The Android Automerger 797256196b JSS15O 2013-08-06 20:09:28 -07:00