Commit graph

14121 commits

Author SHA1 Message Date
Scott Main
a18b429fd3 am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'fe340fac5aa08c9bbba6ce22521a10fce1b811f8':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 17:58:32 -07:00
Scott Main
fe340fac5a am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'e624b3fa474283e0c8d869b9d1754f001e83e349':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 17:55:54 -07:00
Ying Wang
13871a8f50 resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
Ying Wang
65d5e78865 am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:43:34 -07:00
Ying Wang
4b7d8f119a Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS" 2013-09-14 00:41:30 +00:00
Scott Main
e624b3fa47 update the init_google_navtree2 method to handle new format for sample nav tree data.
and update highlighting logic to handle hashtags

Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
2013-09-13 17:04:39 -07:00
Andrew Hsieh
87ceb423a7 am 169395bf: am 0407e1a8: Merge "Rename bin/clang to bin/analyzer"
* commit '169395bf1a7378db1ffbb50f3c6461d9dab17596':
  Rename bin/clang to bin/analyzer
2013-09-13 10:37:00 -07:00
Andrew Hsieh
169395bf1a am 0407e1a8: Merge "Rename bin/clang to bin/analyzer"
* commit '0407e1a849c317885eac51416374994f04de9af6':
  Rename bin/clang to bin/analyzer
2013-09-13 10:34:00 -07:00
Andrew Hsieh
0407e1a849 Merge "Rename bin/clang to bin/analyzer" 2013-09-13 17:32:09 +00:00
Andrew Hsieh
af738a4bdb Rename bin/clang to bin/analyzer
Change-Id: Ie77018e4943823f7d0f18e9249f973a98ee3652a
2013-09-13 15:49:39 +08:00
Ying Wang
8639f2dda2 am 3057adba: Drop the [no]proguard. prefix for the intermediate targets
* commit '3057adbace1eb57cd73f982eb06d897632ece554':
  Drop the [no]proguard. prefix for the intermediate targets
2013-09-12 21:37:25 -07:00
Ying Wang
3057adbace Drop the [no]proguard. prefix for the intermediate targets
Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-12 17:50:11 -07:00
Scott Main
0e50619ad2 am 3938f3e1: am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '3938f3e1af045e887735884b059224a86f46db74':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:19:36 -07:00
Scott Main
3938f3e1af am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:17:26 -07:00
Scott Main
7cba6168c3 am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:16:02 -07:00
Scott Main
9a3fb8711f Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev 2013-09-12 19:14:19 +00:00
Kenny Root
5bffb360f0 resolved conflicts for merge of ecbc22ea to klp-dev-plus-aosp
Change-Id: I72314a9fca71529816245c137b6ab2f8edaf94b8
2013-09-12 12:00:55 -07:00
Kenny Root
ecbc22ead1 am 43077645: Merge "Add libcore.conscrypt tests back to CTS"
* commit '43077645b5ade27fafff808f11539f6a3e176544':
  Add libcore.conscrypt tests back to CTS
2013-09-12 11:55:42 -07:00
Kenny Root
43077645b5 Merge "Add libcore.conscrypt tests back to CTS" 2013-09-12 18:53:38 +00:00
Scott Main
27597c4d8e Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.

This reverts commit 5b743677eb.

Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
2013-09-12 18:45:05 +00:00
Torne (Richard Coles)
d6d4cfedf0 am 5839c0f2: Remove libchromium_net from the base product.
* commit '5839c0f23deb80cce3314172d23ba5926262aef4':
  Remove libchromium_net from the base product.
2013-09-12 09:49:01 -07:00
Kenny Root
ebf1a97a67 Add libcore.conscrypt tests back to CTS
A reorganization of the libcore test jar files caused the Conscrypt
tests to be accidentally dropped from CTS. Add them back in their own
package.

(cherry picked from commit 69c00c9ee8)

Bug: 10210673
Change-Id: I5ffc62736d3dab7e96e480c593e07d6c640b8950
2013-09-12 09:48:13 -07:00
Kenny Root
f913c2dd77 resolved conflicts for merge of b4ada1cc to klp-dev-plus-aosp
Change-Id: Id312795c1401e00c81c9b8d0712222f2933d8fcd
2013-09-12 09:40:58 -07:00
Kenny Root
b4ada1cc94 am 14d43108: Merge "Add Junit4 to the classpath for CollectAllTests"
* commit '14d4310803ee2b9811a7adb381a2ca54b96aefe2':
  Add Junit4 to the classpath for CollectAllTests
2013-09-12 09:18:39 -07:00
Torne (Richard Coles)
5839c0f23d Remove libchromium_net from the base product.
The Chromium network stack is only needed by libwebcore and stagefright,
both of which already explicitly depend on it, so there's no need for it
to be in the base package list.

Bug: 10427705
Change-Id: Ifbb089de867c577788c6310571337c39c4ce31e0
2013-09-12 14:55:36 +01:00
Kenny Root
14d4310803 Merge "Add Junit4 to the classpath for CollectAllTests" 2013-09-12 05:26:01 +00:00
Victoria Lease
ef8921a9bc am 65202c59: include external/sil-fonts
* commit '65202c593d9a196f1e44e62cb545b1dac8935c6e':
  include external/sil-fonts
2013-09-11 11:26:45 -07:00
Victoria Lease
65202c593d include external/sil-fonts
Bug: 10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
(cherry picked from commit fd1327256e)
2013-09-11 18:01:30 +00:00
Scott Main
cd2ced2375 am d9fa5580: am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit 'd9fa558056871433425746499d2bbf4e4d0fc92e':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:19:47 -07:00
Scott Main
d9fa558056 am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:17:38 -07:00
Scott Main
0c2b69d5b8 am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit 'd6125b5e2ff71988009bc0fd86a32876e9a6981f':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:15:04 -07:00
Scott Main
d6125b5e2f am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '2552239a522963429f494ff89a4be6d3831fb1fb':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:09:47 -07:00
Andrew Hsieh
246daf755a resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp
Change-Id: Icd9d5eff3f9acba042c100f694309f902c9d56cf
2013-09-10 18:07:23 -07:00
Andrew Hsieh
2b5d2c55bf am b0f41737: Merge "Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ...""
* commit 'b0f4173700fc37d0765998e7c563c844ee4cbed1':
  Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
2013-09-10 17:10:22 -07:00
Andrew Hsieh
b0f4173700 Merge "Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."" 2013-09-11 00:07:28 +00:00
Kenny Root
8509b0d6f9 Add Junit4 to the classpath for CollectAllTests
This is needed for CollectAllTests to work with Junit4 tests.

Change-Id: I5e339022220b8e40bcb12337a09f3615dad7d53c
2013-09-10 17:00:33 -07:00
Nick Kralevich
46f00b6167 am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
  Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
Nick Kralevich
b5d4c0df50 Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev 2013-09-10 20:13:18 +00:00
Nick Kralevich
0eb17d9447 Update OTA to understand SELinux labels and capabilities
Update the OTA generation script to understand SELinux file
labels and file capabilities.

Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.

Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.

If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.

Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
Andrew Hsieh
906cb78168 Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
The new option WITH_STATIC_ANALYZER=1 instructs build system to
run static analyzer via "clang --analyze" on a successful build.
If analyzer finds any issue, instruction to open report is displayed.
See http://clang-analyzer.llvm.org/scan-build.html for details.

WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist.

Project use lots of GCC extensions (eg. nested function) not supported
by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true

Change-Id: I9970560560bd52ce5f0fd7129c3488629627c735
2013-09-10 17:37:14 +08:00
Scott Main
2552239a52 fix most of size problems of DAC on handsets.
set device-width for viewport tag

Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
2013-09-09 18:51:49 -07:00
Ying Wang
061b89c0bf am 20ef354e: Load the ONE_SHOT_MAKEFILE even in dont_bother mode
* commit '20ef354e8c3a1fc10515a469fcc615935e6fb7cb':
  Load the ONE_SHOT_MAKEFILE even in dont_bother mode
2013-09-09 12:17:20 -07:00
Ying Wang
20ef354e8c Load the ONE_SHOT_MAKEFILE even in dont_bother mode
This makes "mmm <path> snod" work again.
Note that snod has dependency on the rest of the command line goals,
which is all_modules for ONE_SHOT_MAKEFILE,
so build race condition is avoided.

Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
2013-09-09 12:13:25 -07:00
Ying Wang
b4c0656ce6 am 39e08f28: Delete dead code.
* commit '39e08f2827584111f1cb2487ac7a1aae95df7ff0':
  Delete dead code.
2013-09-09 11:39:19 -07:00
Ying Wang
39e08f2827 Delete dead code.
frameworks/policies/base/PolicyConfig.mk does no longer exist.

Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
2013-09-09 11:35:42 -07:00
Victoria Lease
47670f7d18 am fd132725: include external/sil-fonts
* commit 'fd1327256e698a7b5dd677bea45947fd20b23208':
  include external/sil-fonts
2013-09-06 16:07:12 -07:00
Victoria Lease
fd1327256e include external/sil-fonts
Bug: 10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
2013-09-06 14:00:38 -07:00
Dirk Dougherty
2c6124fd6f am 00fcdfed: am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '00fcdfede678c274675436d0008fc4a668ef711c':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 13:38:27 -07:00
Eric Laurent
b2106e47d9 am 7e258f11: Merge "add libeffectproxy for audio effects offloading" into klp-dev
* commit '7e258f11064d51413e5e53fba842ace016ebc032':
  add libeffectproxy for audio effects offloading
2013-09-06 12:58:08 -07:00
Dirk Dougherty
00fcdfede6 am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '0b345f589691a774d04a698e80412c531c726f6c':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:51:52 -07:00