Update for improved glue.
Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
This commit is contained in:
@@ -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.
|
||||
|
||||
Binary file not shown.
@@ -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.
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user