Revert "Fix the compile issues when no device is defined."

This reverts commit 292c5facfe1fb1f0c6e560192230d4fc6e46353f.

diff --git a/Android.mk b/Android.mk
index 3728f87..ad5da7e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -30,14 +30,16 @@ hayes_ril_files := \
 ifeq ($(TARGET_DEVICE),gta04)
        hayes_ril_device_files := device/gta04/gta04.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/gta04/
 ifeq ($(TARGET_DEVICE),gta04)
        hayes_ril_device_files := device/gta04/gta04.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/gta04/

-elsif ($(TARGET_DEVICE),passion)
+endif
+
+ifeq ($(TARGET_DEVICE),passion)

        hayes_ril_device_files := device/passion/passion.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/passion/
        hayes_ril_device_files := device/passion/passion.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/passion/

-elsif ($(TARGET_DEVICE),dream_sapphire)
+endif
+
+ifeq ($(TARGET_DEVICE),dream_sapphire)

        hayes_ril_device_files := device/dream_sapphire/dream_sapphire.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/dream_sapphire/
        hayes_ril_device_files := device/dream_sapphire/dream_sapphire.c
        LOCAL_C_INCLUDES += $(LOCAL_PATH)/device/dream_sapphire/

-else
-       hayes_ril_device_files := device/dummy/dummy.c

 endif
 
 LOCAL_SRC_FILES := $(hayes_ril_files) $(hayes_ril_device_files)
 endif
 
 LOCAL_SRC_FILES := $(hayes_ril_files) $(hayes_ril_device_files)

diff --git a/device/dummy/dummy.c b/device/dummy/dummy.c
deleted file mode 100644 (file)
index 46b6381..0000000
--- a/device/dummy/dummy.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of hayes-ril.
- *
- * Copyright (C) 2012 Paul Kocialkowski <contact@paulk.fr>
- *
- * 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 <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define LOG_TAG "RIL-DEV"
-#include <utils/Log.h>
-
-#include <hayes-ril.h>
-
-struct ril_device dummy_device = {
-       .name = "Dummy",
-       .tag = "DUMMY",
-       .type = DEV_GSM,
-       .sdata = NULL,
-       .handlers = NULL,
-};
-
-void ril_device_register(struct ril_device **ril_device_p)
-{
-       *ril_device_p = &dummy_device;
-}