Commit Graph

12469 Commits

Author SHA1 Message Date
Scott Main 972c379889 am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:05:56 -07:00
Scott Main 28ca0f3244 am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
* commit '25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
  load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:03:55 -07:00
Scott Main 25e7300c24 load the navtree javascript on demand; don't try setting up the tree until it's loaded
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
2013-03-27 15:49:14 -07:00
Brian Carlstrom 923ac1a871 Merge "Added local variable info output to javac command for host build." 2013-03-27 22:44:30 +00:00
jeffhao dc6757a4ce Added local variable info output to javac command for host build.
The host java files weren't being compiled with -g.

(cherry-picked from 3a971f734060d19fc023ccf82e39d956a31b7cfb)

Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
2013-03-26 22:26:44 -07:00
repo sync d3e01c1577 Merge commit 'e8c9e82d' into manualmerge
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
2013-03-26 17:21:01 -07:00
Geremy Condra e8c9e82db0 am 50585e76: Merge "Add sepolicy and mac_perms to installclean"
* commit '50585e76fd13eb3d91f8d9e9e7ae5e1a3cd1ae86':
  Add sepolicy and mac_perms to installclean
2013-03-26 16:39:22 -07:00
Ying Wang 0abb0fd409 Default install path of shared Java library with tag tests
To $(PRODUCT_OUT)/data/framework/.

Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c
2013-03-26 16:01:02 -07:00
Geremy Condra 50585e76fd Merge "Add sepolicy and mac_perms to installclean" 2013-03-26 22:35:50 +00:00
William Roberts a8b3d54101 Add sepolicy and mac_perms to installclean
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.

Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530
2013-03-26 14:54:51 -07:00
Jean-Baptiste Queru 7716c2a3bd Fix build - Add missing backslash
Change-Id: Ic27b8cf0d144bb32fc757f4a01141bba3280307b
2013-03-26 14:21:33 -07:00
Jean-Baptiste Queru 324c123500 Rename AOSP builds to aosp_*
Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687
2013-03-26 14:06:30 -07:00
Ying Wang ba71aba939 Allow to run Proguard on static Java library
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).

Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 14:05:10 -07:00
The Android Open Source Project 68b1d3b077 am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '545c8eed678101a836972c5f68941078f7fb0863':
  JDQ39E
  JDQ39D
  JDQ39C
2013-03-26 10:54:40 -07:00
The Android Open Source Project 545c8eed67 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
2013-03-26 10:53:09 -07:00
Scott Main 531a620474 am 964c6321: am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '964c6321ae015522c9f7e26d47189890b636a592':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 18:19:46 -07:00
Scott Main 964c6321ae am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '709fcf04a0294544658166a10021978870d756ef':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:17:42 -07:00
Scott Main 709fcf04a0 am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:15:12 -07:00
Scott Main 2325250e63 am 9ae6d37a: am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:13:29 -07:00
Scott Main 9ae6d37ad0 am de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit 'de2952768478e6390bcec424bb102911e7f4cbff':
  add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
2013-03-25 16:11:44 -07:00
Scott Main de29527684 add javascript action events to search suggestions and search results.
Allows us to track and compare the success of suggested results and results from Google

Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
2013-03-25 15:54:05 -07:00
Ying Wang 1579e23178 Merge "Support to build vendor.img" into jb-mr2-dev 2013-03-25 20:48:53 +00:00
Dima Zavin 47e27a4f9c Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev 2013-03-25 19:42:45 +00:00
Ying Wang a0febe5e6d Support to build vendor.img
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
Dima Zavin bdbd716eff core: combo: arm: use appropriate mcpu flags for cortex-a7
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-23 02:08:38 -07:00
Ying Wang b2c7917463 am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
  We have to use := instead of +=
2013-03-22 19:50:09 -07:00
Ying Wang ca983c08fb am 97c280ec: Merge "We have to use := instead of +="
* commit '97c280eced879fb79d32bd527412ab34840dba5c':
  We have to use := instead of +=
2013-03-22 19:47:43 -07:00
Ying Wang 97c280eced Merge "We have to use := instead of +=" 2013-03-23 01:56:36 +00:00
Ying Wang 4d063410a3 We have to use := instead of +=
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.

Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
Ying Wang 9b93f37c89 Delete icu4j from pathmap.mk
frameworks/base/icu4j is gone in jb-mr2-dev.

Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
2013-03-22 12:32:50 -07:00
Scott Main 5fe9aaacef am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '159de1de00027ebb9280cf6768d59369416c7a13':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:35:43 -07:00
Scott Main 159de1de00 am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:33:53 -07:00
Scott Main 1b8b0cfee9 am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '7908878061144b25b1e0baf36619db7b32d07c98':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:31:59 -07:00
Scott Main 7908878061 am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '8d92d9ef824f265979e68da927f01aba4bb6b314':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:29:44 -07:00
Scott Main 8d92d9ef82 am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '01a2545bbab916e45eedbd3708f526ed8bd62935':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:27:16 -07:00
Scott Main 01a2545bba docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
Scott Main 1afc758e57 am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:27:05 -07:00
Scott Main 04f2797309 am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '8c052d395db4643303e03efbc35eca0259cee19e':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:25:10 -07:00
Scott Main 8c052d395d am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '82fb80eb11188592f34056e8c787a74a28be6543':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:23:08 -07:00
Scott Main 82fb80eb11 am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:20:42 -07:00
Scott Main ec48ff2bed am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec93c11194f55fb2bd9ae23fa502d701bfb09664':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:18:08 -07:00
Scott Main ec93c11194 Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs 2013-03-20 22:16:27 +00:00
Scott Main a2303454fd add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
The Android Automerger b225d8b17e JDQ39E 2013-03-20 12:24:22 -07:00
Scott Main 18fbd22dff am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
  fix indentation style for nested lists
2013-03-19 14:48:42 -07:00
Scott Main 22b048e106 am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
  fix indentation style for nested lists
2013-03-19 14:48:02 -07:00
Scott Main 86372f1c01 am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
  fix indentation style for nested lists
2013-03-19 14:46:48 -07:00
Scott Main 7524d02ef2 am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
  fix indentation style for nested lists
2013-03-19 14:44:53 -07:00
Scott Main 4264799b51 am 24790db1: fix indentation style for nested lists
* commit '24790db1cd7b84c6c36350b232538e519790f799':
  fix indentation style for nested lists
2013-03-19 14:43:04 -07:00
Scott Main 24790db1cd fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00