Remove the simulator target from all makefiles.
Bug: 5010576 Change-Id: I77e0620f7543926b5def7666c02d99565f6487ed
This commit is contained in:
parent
bdd1ef0af8
commit
5c3560571b
3 changed files with 2 additions and 50 deletions
15
Android.mk
15
Android.mk
|
@ -13,24 +13,13 @@ LOCAL_SHARED_LIBRARIES := libcutils libwpa_client
|
|||
|
||||
LOCAL_INCLUDES += $(LOCAL_PATH)
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
LOCAL_CFLAGS += -DQEMU_HARDWARE
|
||||
QEMU_HARDWARE := true
|
||||
endif
|
||||
LOCAL_CFLAGS += -DQEMU_HARDWARE
|
||||
QEMU_HARDWARE := true
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
LOCAL_SHARED_LIBRARIES += libdl
|
||||
endif
|
||||
|
||||
include $(SAVE_MAKEFILES)
|
||||
|
||||
# need "-lrt" on Linux simulator to pick up clock_gettime
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
ifeq ($(HOST_OS),linux)
|
||||
LOCAL_LDLIBS += -lrt -lpthread -ldl
|
||||
endif
|
||||
endif
|
||||
|
||||
LOCAL_MODULE:= libhardware_legacy
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
# Copyright 2008 The Android Open Source Project
|
||||
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
LOCAL_SRC_FILES += uevent/uevent_stub.c
|
||||
else
|
||||
LOCAL_SRC_FILES += uevent/uevent.c
|
||||
endif
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2008 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.
|
||||
*/
|
||||
|
||||
#include <hardware_legacy/uevent.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int uevent_init()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
int uevent_next_event(char* buffer, int buffer_length)
|
||||
{
|
||||
while (1) {
|
||||
sleep(10000);
|
||||
}
|
||||
|
||||
// won't get here
|
||||
return 0;
|
||||
}
|
Loading…
Reference in a new issue