Commit graph

3067 commits

Author SHA1 Message Date
Ying Wang
c8b5d4b207 am 43d5f927: am 76365787: Get rid of the liblog hack.
* commit '43d5f927c1c8f7f1a7fad431560044565b5415b9':
  Get rid of the liblog hack.
2013-04-10 10:13:08 -07:00
Ying Wang
43d5f927c1 am 76365787: Get rid of the liblog hack.
* commit '7636578729ffcd02bfb5158db884f559a52d8905':
  Get rid of the liblog hack.
2013-04-10 10:09:06 -07:00
Ying Wang
7636578729 Get rid of the liblog hack.
Bug: 8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
2013-04-09 23:27:57 -07:00
Ying Wang
0efc226aac am bbb058ab: am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit 'bbb058abc5e4870d09ed795a11a81576c20337f5':
  Revert "Add liblog"
2013-04-09 23:25:30 -07:00
Ying Wang
bbb058abc5 am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit 'fd068148d64cabd318a7d426840c5127f7a91160':
  Revert "Add liblog"
2013-04-09 22:37:04 -07:00
Ying Wang
cd3190a9f5 Revert "Add liblog"
This reverts commit 8722580d90

Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
2013-04-10 05:32:21 +00:00
Ying Wang
30b2f529e9 am c54a1845: am 134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit 'c54a184547994f698a7b24d98bb3d46577e4ccce':
  Add liblog
2013-04-09 22:25:07 -07:00
Ying Wang
c54a184547 am 134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit '134ec88c943ad0453d5716edceacca46a621e026':
  Add liblog
2013-04-09 22:17:07 -07:00
Ying Wang
8722580d90 Add liblog
Bug: 8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
2013-04-09 21:41:48 -07:00
Ying Wang
4d18730567 am 31e588e4: am dd75a03d: Fix the win_sdk build.
* commit '31e588e4e1f7fa4223d01999150c7e2a71c797ac':
  Fix the win_sdk build.
2013-04-05 19:00:00 -07:00
Ying Wang
31e588e4e1 am dd75a03d: Fix the win_sdk build.
* commit 'dd75a03d35499c34db913e886dbed5c37f5ce6d8':
  Fix the win_sdk build.
2013-04-05 18:57:06 -07:00
Ying Wang
dd75a03d35 Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
2013-04-05 18:51:32 -07:00
Ying Wang
eccc9a5723 am adf3e7fb: am 854be683: Switch to prebuilt bison
* commit 'adf3e7fb301eaddecdd949f83a3e4cf288635879':
  Switch to prebuilt bison
2013-04-05 18:29:16 -07:00
Ying Wang
adf3e7fb30 am 854be683: Switch to prebuilt bison
* commit '854be683636892eed455100d0c20b0f7dd8c5076':
  Switch to prebuilt bison
2013-04-05 18:25:57 -07:00
Ying Wang
854be68363 Switch to prebuilt bison
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:02:16 -07:00
Brian Carlstrom
1bcbf3593d am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
* commit '712676772b0d6e32bdce3430eed0a4d9771aac7e':
  Add OkHttp to the platform.
2013-04-03 15:03:48 -07:00
Brian Carlstrom
712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
2013-04-03 14:19:26 -07:00
Ulas Kirazci
bde274ef83 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-04-03 13:37:07 -07:00
jwilson
190dde0b1a Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
2013-04-02 16:24:04 -07:00
Jeff Brown
4a00745f15 am b528116b: am dd243370: apicheck: Suppress certain changes in final qualifier.
* commit 'b528116bba0e690f620ee2a150560ce8217490de':
  apicheck: Suppress certain changes in final qualifier.
2013-04-02 11:03:40 -07:00
Jeff Brown
b528116bba am dd243370: apicheck: Suppress certain changes in final qualifier.
* commit 'dd243370f509115a9e3bd263dcf31e74ae448bd5':
  apicheck: Suppress certain changes in final qualifier.
2013-04-02 08:24:12 -07:00
Wink Saville
69babbdc38 am 061604bd: am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '061604bdadd797a5371248c177e77c942c2c44f6':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:04:14 -07:00
Wink Saville
061604bdad am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:02:06 -07:00
Wink Saville
0262d0f747 Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 2013-04-02 00:43:39 +00:00
Jeff Brown
dd243370f5 apicheck: Suppress certain changes in final qualifier.
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.

Likewise it is always safe to remove final.

Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
2013-04-01 14:24:49 -07:00
Ying Wang
f94ace13bd am 6686497b: am 51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
* commit '6686497ba38eec4b1ec62fc40b25b111a3653643':
  Default install path of shared Java library with tag tests
2013-04-01 12:06:02 -07:00
Ying Wang
51f7dcb9ad Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 2013-04-01 19:00:13 +00:00
keunyoung
69e8d67768 am aa0d1a17: am 6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
* commit 'aa0d1a173787bdc766a0fa48052c0cf796f91602':
  find pdk platform.zip from full_ directory as well for aosp_ products
2013-03-28 17:15:40 -07:00
keunyoung
6f79520bf7 Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev 2013-03-29 00:11:23 +00:00
Devin Kim
7a9967ac83 am e8ca0a6f: am 60b9efc0: Do not disable factory build under PDK
* commit 'e8ca0a6f06a480322c40bd13e605885248b1ef1a':
  Do not disable factory build under PDK
2013-03-28 16:43:56 -07:00
Ulas Kirazci
76e3a39061 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 16:28:09 -07:00
keunyoung
3b4856e842 find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
Devin Kim
60b9efc060 Do not disable factory build under PDK
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk

Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
2013-03-28 14:38:11 -07:00
Brian Carlstrom
6e24674530 am fd642ed5: am d76ff19a: Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
* commit 'fd642ed55349dbb482f27f339e2a3509e05fdf25':
  Added local variable info output to javac command for host build.
2013-03-27 17:16:48 -07:00
Stephen Hines
c519284395 am 92b82aa2: am ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
* commit '92b82aa2eeb9f3867e2d381e8324da4ebc35658e':
  Link RS compatibility files with libc and make bcc_compat a regular dep.
2013-03-27 17:16:47 -07:00
Brian Carlstrom
d76ff19a0f Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev 2013-03-28 00:11:20 +00:00
Brian Carlstrom
8c374054b3 resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
2013-03-27 17:04:05 -07:00
Stephen Hines
8db4ccea4a Link RS compatibility files with libc and make bcc_compat a regular dep.
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.

Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
2013-03-27 16:51:38 -07: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
gcondra@google.com
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
repo sync
d3e01c1577 Merge commit 'e8c9e82d' into manualmerge
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
2013-03-26 17:21:01 -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
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
Ying Wang
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
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
Ying Wang
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
Ying Wang
1579e23178 Merge "Support to build vendor.img" into jb-mr2-dev 2013-03-25 20:48:53 +00:00
Dima Zavin
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
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