From 29534f6275fdc4cba1c732f89f8442b6d887eb50 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 9 Jul 2010 18:21:45 -0700 Subject: [PATCH] Update for improved glue. Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558 --- .../usr/include/android_glue/threaded_app.h | 6 ------ .../arch-arm/usr/lib/libthreaded_app.a | Bin 50808 -> 50780 bytes ndk/samples/native-activity/jni/Android.mk | 2 +- ndk/samples/native-activity/jni/main.c | 2 -- ndk/samples/native-plasma/jni/Android.mk | 14 ++++++++++++++ ndk/samples/native-plasma/jni/plasma.c | 2 -- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h b/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h index 491389bb0..adfdbea06 100644 --- a/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h +++ b/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h @@ -143,12 +143,6 @@ enum { APP_CMD_DESTROY, }; -/** - * Call if android_app->destroyRequested is non-zero. Upon return, the - * android_app structure is no longer valid and must not be touched. - */ -void android_app_destroy(struct android_app* android_app); - /** * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next * app command message. diff --git a/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a b/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a index a21c7e5532722c7337b4efd769829c13b9469eca..6c6589fbc3bbdd05f6ec93fa523816e46da2f220 100644 GIT binary patch delta 14450 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 delta 14661 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 SmTpNrMFqxXGl?nOD*g{bR2LTj diff --git a/ndk/samples/native-activity/jni/Android.mk b/ndk/samples/native-activity/jni/Android.mk index 8ce70aae0..b1afdf5f2 100644 --- a/ndk/samples/native-activity/jni/Android.mk +++ b/ndk/samples/native-activity/jni/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009 The Android Open Source Project +# Copyright (C) 2010 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ndk/samples/native-activity/jni/main.c b/ndk/samples/native-activity/jni/main.c index 50f0a8cd6..f11c26ef7 100644 --- a/ndk/samples/native-activity/jni/main.c +++ b/ndk/samples/native-activity/jni/main.c @@ -193,8 +193,6 @@ void android_main(struct android_app* state) { if (!engine_do_main_cmd(&engine)) { LOGI("Engine thread destroy requested!"); engine_term_display(&engine); - android_app_destroy(state); - // Can't touch android_app object after this. return; } break; diff --git a/ndk/samples/native-plasma/jni/Android.mk b/ndk/samples/native-plasma/jni/Android.mk index e9dcaea70..34e85a1f5 100644 --- a/ndk/samples/native-plasma/jni/Android.mk +++ b/ndk/samples/native-plasma/jni/Android.mk @@ -1,3 +1,17 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) diff --git a/ndk/samples/native-plasma/jni/plasma.c b/ndk/samples/native-plasma/jni/plasma.c index 3ccb6058c..964b8920e 100644 --- a/ndk/samples/native-plasma/jni/plasma.c +++ b/ndk/samples/native-plasma/jni/plasma.c @@ -480,8 +480,6 @@ void android_main(struct android_app* state) { if (!engine_do_main_cmd(&engine)) { LOGI("Engine thread destroy requested!"); engine_term_display(&engine); - android_app_destroy(state); - // Can't touch android_app object after this. return; } break;