7bcaf9a997547b14e9b755c53926aa39dde8973f - platform/frameworks/base

commit	7bcaf9a997547b14e9b755c53926aa39dde8973f	[log] [tgz]
author	Yohann Roussel <yroussel@google.com>	Mon Sep 08 14:53:12 2014 +0200
committer	Yohann Roussel <yroussel@google.com>	Tue May 19 18:17:39 2015 +0200
tree	fb83cff3a8d0179ba0c93ad73784bc14ea22c44e
parent	838a7e50eba73d4e5289ea3975636a0c841bea70 [diff]

[DO NOT MERGE] Allow compilation with Jack.

Adapt to Jack compilation specifics.

Fix bad import in VideoDumpActivity.
The extra semicolumn is ignored by javac because of
https://bugs.openjdk.java.net/browse/JDK-8027682 but is not
permitted by ecj or Jack.

This includes cherry-picks of the following changes:
248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf
705555dc468e46560d02db102dfcedc1e5c70d9e
f50a51fb4c8d5ca973ce910a21bddf9f8466cb51
bf5ad8d9943c0e1b0b3f1b4524c277f369065d08

Change-Id: Ifbe063e3822a7d63b1681921b9788cfca898ba64

Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyAndException/test.jpp[Added - diff]
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp[Added - diff]
core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp[Added - diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/test.jpp[Added - diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk[diff]
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/test.jpp[Added - diff]
media/tests/MediaDump/src/com/android/mediadump/VideoDumpActivity.java[diff]

13 files changed

tree: fb83cff3a8d0179ba0c93ad73784bc14ea22c44e