Commit Graph

13545 Commits

Author SHA1 Message Date
Jason Monk 5cdc0a9323 Remove old PAC dependency and add new one.
PAC support has been changed from a standalone executable to an apk
that needs to be part of the build.  This removes the old depency
and adds the new one.

Bug: 10182711
Change-Id: I1291f54d81e6ec0c775e045a3446bd0cffb40019
2013-08-19 15:42:32 -04:00
Dirk Dougherty 2d0283792d am 6d244fb2: am d5ac8330: am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
  doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:14:19 -07:00
Dirk Dougherty 6d244fb2ed am d5ac8330: am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit 'd5ac833061b2233b71a60155656ca97cd5494746':
  doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:12:07 -07:00
Dirk Dougherty d5ac833061 am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '4f7e5159409e71ecfeba86858f5ec044d043aff8':
  doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:09:46 -07:00
Dirk Dougherty 4f7e515940 doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
2013-08-19 11:28:59 -07:00
Ying Wang a7deb0857c Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.

Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
2013-08-16 13:24:47 -07:00
Scott Main 6f03bd6092 am ce478d54: am 7e453280: am 52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the referen
* commit 'ce478d54ad619c11b796b6286357c3203544d90d':
  fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
2013-08-15 14:51:37 -07:00
Scott Main ce478d54ad am 7e453280: am 52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '7e453280539406882215a0602ae6f63d7585fb9f':
  fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
2013-08-15 14:45:35 -07:00
Scott Main 7e45328053 am 52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '52dd206715e9d8e80a22c7106ec783324d51e747':
  fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
2013-08-15 14:43:45 -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
Scott Main 52dd206715 fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).

Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
2013-08-15 12:22:28 -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
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 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 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
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
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 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 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
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
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 ee676f508a "JLS36B" 2013-08-08 16:53:41 -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
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
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 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 0cc007a161 JWR66W 2013-08-06 20:33:52 -07:00
The Android Automerger 797256196b JSS15O 2013-08-06 20:09:28 -07:00
Mike Lockwood c73018c2e9 Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
2013-08-06 16:15:48 -07:00
Mike Lockwood 6e5d867e30 Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
Stuart Scott ee0748821f Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
bug: 10146858

Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
2013-08-05 16:05:08 -07:00
The Android Automerger da28a797d8 JLS36 2013-08-05 15:25:41 -07:00
The Android Automerger c2b7823e5f JSS15N 2013-08-05 11:12:19 -07:00
Ying Wang bc9e8a7c7f am 4a0929e3: am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '4a0929e3590b08838280bffae56d357a6194260e':
  Remove unnecessary dependencies between host and target modules.
2013-08-02 17:58:22 -07:00
Stephen Hines c48d08a334 resolved conflicts for merge of 79ee17ea to master
Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e
2013-08-02 17:50:03 -07:00
Ying Wang 4a0929e359 am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
  Remove unnecessary dependencies between host and target modules.
2013-08-02 17:40:59 -07:00