diff options
| author | Elliott Hughes <enh@google.com> | 2011-04-08 14:10:28 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-04-08 15:01:19 -0700 |
| commit | 69a017bc1d1649350f830dfada5c6ed5eac0b770 (patch) | |
| tree | 6ecc6d9658272b268ce931d417930e2ea1bfa3f7 /core/jni/Android.mk | |
| parent | 5008e92d1fd573d926cd55c39ca723a6fbdf7c4b (diff) | |
| download | frameworks_base-69a017bc1d1649350f830dfada5c6ed5eac0b770.zip frameworks_base-69a017bc1d1649350f830dfada5c6ed5eac0b770.tar.gz frameworks_base-69a017bc1d1649350f830dfada5c6ed5eac0b770.tar.bz2 | |
More JNI exception-throwing cleanup.
There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.
There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.
Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 54b7fbb..f8f8761 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -176,7 +176,8 @@ LOCAL_C_INCLUDES += \ external/icu4c/common \ external/jpeg \ external/harfbuzz/src \ - frameworks/opt/emoji + frameworks/opt/emoji \ + libcore/include LOCAL_SHARED_LIBRARIES := \ libexpat \ |