6c3f41ac7c
am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit 'a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:10:10 -07:00
a6188a56ea
am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '972c3798890f8b0e20005eece62ee88f508dd761':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:07:57 -07:00
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
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
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
923ac1a871
Merge "Added local variable info output to javac command for host build."
2013-03-27 22:44:30 +00:00
1495b13771
JWQ86
2013-03-27 05:57:57 -07:00
ff5857e2af
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-27 05:55:24 -07:00
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
9e1c80445d
am 4ae7a261: am d3e01c15: Merge commit \'e8c9e82d\' into manualmerge
...
* commit '4ae7a26166ada636da42e5e5c8ecf5cd655da617':
Add sepolicy and mac_perms to installclean
2013-03-26 17:32:02 -07:00
4ae7a26166
am d3e01c15: Merge commit \'e8c9e82d\' into manualmerge
...
* commit 'd3e01c1577799a04ec045002ef092a6b992c3972':
Add sepolicy and mac_perms to installclean
2013-03-26 17:30:26 -07:00
d3e01c1577
Merge commit 'e8c9e82d' into manualmerge
...
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
2013-03-26 17:21:01 -07:00
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
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
50585e76fd
Merge "Add sepolicy and mac_perms to installclean"
2013-03-26 22:35:50 +00:00
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
53317aebaf
am 0be63397: am 7716c2a3: Fix build - Add missing backslash
...
* commit '0be633973d8e0e0be4b0b99f8f09bcac295341c8':
Fix build - Add missing backslash
2013-03-26 14:26:06 -07:00
0be633973d
am 7716c2a3: Fix build - Add missing backslash
...
* commit '7716c2a3bd1397f96a0634c9cedc6148d7e60e4d':
Fix build - Add missing backslash
2013-03-26 14:24:07 -07:00
7716c2a3bd
Fix build - Add missing backslash
...
Change-Id: Ic27b8cf0d144bb32fc757f4a01141bba3280307b
2013-03-26 14:21:33 -07:00
e9c690e858
am 6c7d0605: am 324c1235: Rename AOSP builds to aosp_*
...
* commit '6c7d0605de994621aa9b3b814951955ac590169a':
Rename AOSP builds to aosp_*
2013-03-26 14:15:00 -07:00
6c7d0605de
am 324c1235: Rename AOSP builds to aosp_*
...
* commit '324c123500d0f0da0ce92b246c65386050618563':
Rename AOSP builds to aosp_*
2013-03-26 14:13:07 -07:00
1671c74be6
am e78893d3: am ba71aba9: Allow to run Proguard on static Java library
...
* commit 'e78893d3e0106f70adccac773cf08c23aa2fda3e':
Allow to run Proguard on static Java library
2013-03-26 14:11:31 -07:00
e78893d3e0
am ba71aba9: Allow to run Proguard on static Java library
...
* commit 'ba71aba939dc58a3278646039337f13d17e65ef2':
Allow to run Proguard on static Java library
2013-03-26 14:09:36 -07:00
324c123500
Rename AOSP builds to aosp_*
...
Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687
2013-03-26 14:06:30 -07:00
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
6062fc03b4
am 196aacf2: (-s ours) am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '196aacf2fdea6c9070a2a3a9dc1a9fe43dec48ba':
JDQ39E
JDQ39D
JDQ39C
2013-03-26 12:17:51 -07:00
edae933ee1
am 565b5d1b: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '565b5d1b973b587d57222eb0f9a6f2b07623bca3':
JWQ85
JWQ84B
JWQ84
JWQ80C
JWQ80B
JWQ80
JWQ79B
2013-03-26 12:17:38 -07:00
196aacf2fd
am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '68b1d3b077af7561934a16f3d7e1accf461870cf':
JDQ39E
JDQ39D
JDQ39C
2013-03-26 10:57:33 -07:00
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
545c8eed67
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
2013-03-26 10:53:09 -07:00
565b5d1b97
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icbbd50582351b94fc2d424995331daac6edf5855
2013-03-26 10:49:03 -07:00
1e71487b2d
JWQ85
2013-03-26 05:57:37 -07:00
6cd2d19060
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:55:13 -07:00
dc75794ec2
Add reboot to build
...
reboot is not a symlink to toolbox anymore and is built separately
Change-Id: I1ded0b46650eeb6365ded86dee1a58d2b0c903e6
2013-03-25 21:26:02 -07:00
efd91eaee4
am df122f1f: am 531a6204: 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 'df122f1fe63c57adbfe9df1b3918d08cb9363736':
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-26 01:25:32 +00:00
df122f1fe6
am 531a6204: 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 '531a620474cefc4d70c7f6c606bb6f134d8f943c':
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-26 01:24:00 +00:00
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
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
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
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
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
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
9ea3ce11ba
JWQ84B
2013-03-25 15:35:00 -07:00
0810498018
am a5b29e21: am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev
...
* commit 'a5b29e212a847fc285fc72c2e13c37b133e09119':
Support to build vendor.img
2013-03-25 20:55:54 +00:00
a5b29e212a
am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev
...
* commit '1579e23178a6ae72bb3051a0385a1852dd970f1a':
Support to build vendor.img
2013-03-25 20:53:39 +00:00
1579e23178
Merge "Support to build vendor.img" into jb-mr2-dev
2013-03-25 20:48:53 +00:00
63143019f1
am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
...
* commit '0cfdb4e9650975077a74bb5c812e79556ac67421':
core: combo: arm: use appropriate mcpu flags for cortex-a7
2013-03-25 19:44:53 +00:00
0cfdb4e965
am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
...
* commit '47e27a4f9ca67facd6501bf24314e6e02117b0d4':
core: combo: arm: use appropriate mcpu flags for cortex-a7
2013-03-25 19:43:40 +00:00
47e27a4f9c
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
2013-03-25 19:42:45 +00:00
a0febe5e6d
Support to build vendor.img
...
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
Scott Main