Commit graph

11220 commits

Author SHA1 Message Date
Jeff Sharkey
1d0608f9c5 Merge "sepgrep -- function to grep SELinux policy files." 2013-05-07 17:45:24 +00:00
Alex Klyubin
ba5fc8e593 sepgrep -- function to grep SELinux policy files.
Change-Id: Ib86a124296ecbc2b2ce9a0323c40c85ceb6cd466
2013-05-07 10:19:48 -07:00
Kenny Root
b4314f1534 Merge "Track change to JSSE provider" 2013-04-30 04:02:20 +00:00
Kenny Root
13611990f6 Track change to JSSE provider
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
2013-04-29 14:58:54 -07:00
Nick Kralevich
042723c015 Merge "x86/mips: enable _FORTIFY_SOURCE=2" 2013-04-29 20:51:27 +00:00
Nick Kralevich
fb45baa7e7 x86/mips: enable _FORTIFY_SOURCE=2
Enable _FORTIFY_SOURCE=2 for x86 and MIPS.

Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.

The ARM change was made in 316f720b91

Change-Id: Iafe90beadf9b6a41ea294b7107cf4f18141acf3a
2013-04-29 12:41:53 -07:00
Nick Kralevich
835816ae9e Merge "arm: upgrade to _FORTIFY_SOURCE=2" 2013-04-26 01:28:11 +00:00
Nick Kralevich
316f720b91 arm: upgrade to _FORTIFY_SOURCE=2
Enable _FORTIFY_SOURCE=2 for ARM.

Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.

Change-Id: Ib4c8e44e6949a37352c153e3c52a4fa001f18738
2013-04-25 16:52:02 -07:00
Jean-Baptiste Queru
f7e5c42408 Reconcile with mr1.1-release
Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7
2013-04-17 14:20:24 -07:00
Ying Wang
b157840462 Merge "Fix /system/app/$app.odex not updated issue" 2013-04-17 16:23:11 +00:00
Chih-Wei Huang
868e0c5a00 Fix /system/app/$app.odex not updated issue
$(built_odex) depends on $(LOCAL_BUILT_MODULE) but doesn't have any build
recipe. It is built by the rules of $(LOCAL_BUILT_MODULE) that results in
a subtle bug: $(built_odex) is always newer than $(LOCAL_BUILT_MODULE)
if $(LOCAL_BUILT_MODULE) rebuilt. Therefore 'make' thinks the targets
(/system/app/$app.odex) depending on $(built_odex) don't need to be updated.
It seems an allegedly optimization bug of 'make'.

The simple fix is to explicitly add $(LOCAL_BUILT_MODULE) as a dependency
of $(installed_odex).
2013-04-17 16:00:40 +08:00
Justin Ho
f03d227b09 This is JER09
Change-Id: I0cc358c96b1c090dc26e20fec40982a21bca7474
2013-04-09 08:21:39 -07:00
Justin Ho
2c770eadd7 This is JER08
Change-Id: Ide7d8fd915c6ee0d0f856d8cb60d7f68ea58c961
2013-04-08 08:07:26 -07:00
Ying Wang
4996c8073e Merge "Fix the win_sdk build." 2013-04-06 02:51:24 +00:00
Ying Wang
2321482e04 Merge "Switch to prebuilt bison" 2013-04-06 02:51:05 +00:00
Ying Wang
66a68857a1 Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
2013-04-05 19:03:58 -07:00
Ying Wang
ced0e1b834 Switch to prebuilt bison
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:35:51 -07:00
Ed Heyl
c4c1711d5d JER05
Change-Id: Ice879d6d5884c4193e65e1445c3e077fe7151650
2013-04-05 09:14:18 -07:00
Ying Wang
5ec66d1542 Merge "Add OkHttp to the platform." 2013-04-03 19:31:24 +00:00
jwilson
190dde0b1a Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
2013-04-02 16:24:04 -07:00
Wink Saville
0262d0f747 Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 2013-04-02 00:43:39 +00:00
Ying Wang
a1fd8e44b7 Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools" 2013-03-30 01:20:27 +00:00
Ying Wang
564f912223 Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
2013-03-29 17:40:14 -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
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
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
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
The Android Automerger
b225d8b17e JDQ39E 2013-03-20 12:24:22 -07:00
Andrew Hsieh
55c06f7595 Merge "Duplicate libgcc.a in front of *so" 2013-03-19 17:59:51 +00:00
Andrew Hsieh
8725b941b0 Duplicate libgcc.a in front of *so
Also see 6c7bc550ad

Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
2013-03-19 07:51:52 -07:00
Ben Cheng
e03142454b Merge "Link libgcc.a before shared libraries (especially libc.so)." 2013-03-18 21:05:23 +00:00
Ben Cheng
6c7bc550ad Link libgcc.a before shared libraries (especially libc.so).
[cherry-picked from internal master]

Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
2013-03-18 14:00:44 -07:00
Raphael Moll
0ec2f3df4b Merge "Build SDK using prebuilts/devtools." 2013-03-14 18:31:36 +00:00
The Android Automerger
a910a319de JDQ39D 2013-03-14 09:09:42 -07:00
Raphael Moll
8a2b7707dd Build SDK using prebuilts/devtools.
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
  any more but in the sdk/product.mk instead (which they were.)

Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
2013-03-13 15:30:35 -07:00
The Android Automerger
25fd33abe4 JDQ39C 2013-03-12 11:24:51 -07:00
Ying Wang
c36f41fd38 Merge "Support gdb wrappers" 2013-03-11 16:08:23 +00:00
John Michelau
502002526f Support gdb wrappers
Use gdbwrapper() for launching gdb.  This can be redefined to launch
one of the many gdb wrappers instead.

Example:
function gdbwrapper()
{
    ddd --debugger $ANDROID_TOOLCHAIN/$GDB -x "$@"
}

Change-Id: I3cce8a2ca1bae6d531e2388a93cb52075b21a42c
2013-03-08 14:12:32 -06:00
Kenny Root
eda132820b Merge changes I1998a9d6,I2513f0de
* changes:
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
2013-03-08 19:23:00 +00:00
Jeff Sharkey
301bbadb12 Function to grep AndroidManifest.xml files.
(cherry picked from commit 50b61e9e66)

Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
2013-03-08 10:56:45 -08:00
Jeff Sharkey
cfe0969ab9 Utility to dump stacks from arbitrary processes.
Saves any existing traces, dumps stacks from the target process,
then restores the original traces.

(cherry picked from commit f582437162)

Change-Id: I2513f0de0d90cccd56c4949ca7d218e430439c00
2013-03-08 10:55:37 -08:00
Ying Wang
c47bea9dd9 Merge "Remove nonexisting module names." 2013-03-08 02:30:48 +00:00
Ying Wang
512b9628b0 Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Christopher Ferris
161e0ef974 Merge "Adding TARGET_CPU_VARIANT to config file." 2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3 Adding TARGET_CPU_VARIANT to config file.
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.

Merge from internal master.

Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
2013-03-07 18:12:50 -08:00
Ying Wang
671d90ea1d Merge "Add module names to emulator PRODUCT_PACKAGES." 2013-03-08 01:15:00 +00:00
Ying Wang
18be7ab2c9 Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar." 2013-03-06 21:55:33 +00:00