Commit graph

23482 commits

Author SHA1 Message Date
Ying Wang
589e8c52fb Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
  TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
  dir.

Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Nick Kralevich
7e72d990af Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev 2015-05-19 12:52:17 +00:00
Yohann Roussel
0a0b640f50 Merge "Save Jack default extra args in a file" into mnc-dev 2015-05-19 09:27:43 +00:00
Yu Ning
0f54ada1cd Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:

 setprop ro.radio.noril yes
 stop ril-daemon

so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.

This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)

(cherrypicked from commit 33dca8090f)

Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 19:46:18 -07:00
William Roberts
c434f71bd8 Update device to use set_prop() macro
(cherrypicked from commit cccc901639)

Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
2015-05-18 19:20:03 -07:00
Siva Velusamy
70b67accbf Don't exclude GPL binaries from the emulator system image
GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
2015-05-18 23:14:18 +00:00
Vince Harron
1dadfec6e0 Merge "Improved/clarified license guidance for GPL code." into mnc-dev 2015-05-18 19:58:01 +00:00
Dirk Dougherty
fd2d4fc975 am 9cf9a6c6: am a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '9cf9a6c6dcd9d58024dc115a703feb7bc47098bd':
  Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
2015-05-18 18:49:35 +00:00
Yu Ning
e9ec053e99 Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:

 init: Service 'qemud' (pid XXX) exited with status 1

Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.

(cherrypicked from commit 4783467922)

Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 09:55:07 -07:00
Andres Morales
f1d32a1e14 remove gatekeeper software module
now implemented directly in gatekeeperd binary

Change-Id: Iaeb8e97427dbcffd1356fa955d61af55e3e330ec
2015-05-18 09:24:44 -07:00
Yohann Roussel
b6bfb5893a Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Dirk Dougherty
9cf9a6c6dc am a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit 'a8bbfca3d0ba7da40f9348eeb38badda575fe411':
  Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
2015-05-16 00:32:01 +00:00
Dirk Dougherty
a8bbfca3d0 Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Change-Id: I80124a8a05311976a7c373dfdaf5bb984a9c3bc7
2015-05-15 17:05:38 -07:00
Vince Harron
a48c74fb3d Improved/clarified license guidance for GPL code.
This messaging approved by Google Open Source Licensing.

Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
2015-05-15 17:01:01 -07:00
Daniel Cashman
09ee0a4252 Merge "Label /dev/goldfish_pipe as qemu_device" into mnc-dev 2015-05-15 15:42:24 +00:00
Yu Ning
b23b5cc4a4 Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".

Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.

This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.

Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.

(cherry-pick of commit: a5053e6b35)

Change-Id: I52e75c94d3ae3758cbbf5bc0e1d84254fdf5c6cb
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-15 07:44:28 -07:00
Tao Bao
1a833d24c4 Merge "Add support for clobbered blocks" into mnc-dev 2015-05-14 21:54:21 +00:00
Neil Fuller
f9f9c3f31e Merge "Add tzdatacheck to image" into mnc-dev 2015-05-14 10:15:01 +00:00
Neil Fuller
7d18a68417 Add tzdatacheck to image
Bug: 21110439
Bug: 19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
2015-05-14 10:15:35 +01:00
David Friedman
8025e2854e am 802f05f0: am 2f9407e1: am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '802f05f0e47ab15955b0c460db0c751b982a6f34':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-14 00:00:12 +00:00
David Friedman
802f05f0e4 am 2f9407e1: am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '2f9407e197242eb3a9db188f901369e09e11a152':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:46:38 +00:00
Filip Gruszczynski
8eade31f98 am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '7fbb988da154ad91461c3d51994ae0ff99d94032':
  Add percent library to support libraries build.
2015-05-13 23:46:29 +00:00
Filip Gruszczynski
7fbb988da1 Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev 2015-05-13 23:32:06 +00:00
David Friedman
2f9407e197 am f004b114: am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit 'f004b1149db26f24188eeaa1fe65a4743c4e9b31':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:30:43 +00:00
David Friedman
f004b1149d am 302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '302e2f9cb58de33c529b6ac02421fb0b63b7fcb0':
  Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
2015-05-13 23:16:45 +00:00
Dirk Dougherty
02a8026143 am 7a72fdd4: am f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit '7a72fdd4e46c907c7deac8e6cd75df156ec244f0':
  Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
2015-05-13 21:44:39 +00:00
Dirk Dougherty
7a72fdd4e4 am f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit 'f97b2ef21a9940ec7a41c9116a79f9b2a36e0c1d':
  Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
2015-05-13 21:34:56 +00:00
Dirk Dougherty
f97b2ef21a Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
Change-Id: I6e33dd10e1c9e8b378080464b4b70ac6b10df8b7
2015-05-13 13:54:09 -07:00
Tao Bao
5ece99d64e Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.

Bug: http://b/20939131
Change-Id: I657025b7b1ad50d4365e7b18dc39308facfe864e
(cherry picked from commit ff7778166b)
2015-05-13 12:26:04 -07:00
dcashman
c0ba40b8a1 Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev 2015-05-13 18:38:18 +00:00
dcashman
49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests.  Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.

(cherry-pick of commit: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
Geoff Mendal
8788add72c Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release}
Bug: 21095280
2015-05-13 09:57:01 -07:00
David Friedman
302e2f9cb5 Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download
option.

Change-Id: I6ac64b6a2e0f4cca75e043c92a7e0e2395fe71de
2015-05-13 07:10:22 -07:00
Jeff Sharkey
3ce2e60ffc Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:39 +00:00
Bart Sears
0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Dan Albert
f807d1fa6f Merge "Remove stlport from global package list." into mnc-dev 2015-05-12 23:11:32 +00:00
Dan Albert
93f22ee7e2 Merge "Disallow using stlport." into mnc-dev 2015-05-12 23:11:10 +00:00
Jeff Sharkey
dea22725d4 New "sm" shell tool to call StorageManager.
Bug: 19993667
Change-Id: I9021794eb6f69c7f53151a887a85788d315ab67d
2015-05-12 15:53:29 -07:00
Evgeniy Stepanov
04cfb9e113 Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-dev
* changes:
  --no-as-needed needs -Wl.
  Fix AddressSanitizer link order and multilib setup.
  Make asan more closely match clang behavior.
2015-05-12 22:34:16 +00:00
Dan Albert
bdd8ca0604 --no-as-needed needs -Wl.
Not sure why my checkbuild passed.

Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
2015-05-12 14:04:55 -07:00
Evgenii Stepanov
6708b6c99c Fix AddressSanitizer link order and multilib setup.
ASan runtime library (when using dynamic linking) must be the first
dependency of the main executable to achieve correct symbol
interposition. This matches how the clang driver works.

In multilib setup, ASan-RT name depends on the target arch:
  /system/lib/libclang_rt.asan-arm-android.so
  /system/lib64/libclang_rt.asan-arm64-android.so

We also set RPATH to /system/lib/asan or /system/lib64/asan
to have a place for ASan-only versions of system libraries.

Change-Id: I937d202077b6e433ba476c075d31be818b662d53
2015-05-12 13:40:29 -07:00
Dan Albert
eebb800170 Make asan more closely match clang behavior.
Always link libm with asan. Hasn't been a problem before because ASAN
was only ever used when libc++ was as well, which already links libm.

Pass --no-as-needed for host modules.

These aren't needed for the target builds because the target uses the
shared RTL.

Change-Id: I3b95c8682c0f63bac6b726f8cd15c638aaa98311
2015-05-12 13:40:26 -07:00
Ying Wang
480a9bb64e Keep Throwable's constructor that takes a String argument.
Bug: 20495321
Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
2015-05-11 14:56:20 -07:00
Filip Gruszczynski
8c97e1782b Add percent library to support libraries build.
Change-Id: I8d54f4249f609032fde1d015900204e284fc0c60
2015-05-11 11:58:01 -07:00
Stephen Smalley
901d792cbf Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64
emulator targets.  As a first cut, simply inherit from the
existing policy directories used for generic and generic_x86.
We may need further board-specific policy added for these targets
but testing will require first enabling SELinux in the relevant
kernel configs.

(cherrypicked from commit 21ebc213bb)

Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-05-11 10:46:51 -07:00
Tao Bao
f3282b4a7f Wrap zipfile.write(), writestr() and close()
In order to work around the zip 2GiB limit, we need to wrap the related
functions in zipfile. Calls to those functions should always be replaced
with calls to the wrappers instead.

Bug: 18015246
Change-Id: I499574cee51ec4804bc10cbefe0b17940afed918
(cherry picked from commit 2ed665a033)
2015-05-08 15:53:27 -07:00
Andres Morales
821a554c1b Merge "[versionitis] pull image id from recovery into props" into mnc-dev 2015-05-08 22:04:27 +00:00
Andres Morales
b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Ying Wang
90598cb70c Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
2015-05-08 13:27:25 -07:00
Ying Wang
d508778493 Merge "Revert "Fix and cleanup."" into mnc-dev 2015-05-08 18:51:22 +00:00