move common stuff to p1-common and merge new changes

Change-Id: I5881b49efe5a0fbe95633b3ca69fe3d2602c6ff7

Android.mk

@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),galaxytab)
+ifeq ($(TARGET_DEVICE),p1)
 
 ifneq ($(TARGET_SIMULATOR),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidBoard.mk

@@ -1,26 +1,8 @@
-# Copyright (C) 2009 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.
-
-#
-# AndroidBoard.mk is a legacy mechanism to deal with a few
-# edge-cases that can't be managed otherwise. No new rules
-# should be added to this file.
-#
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
+
 # include the non-open-source counterpart to this file
--include vendor/samsung/galaxytab/AndroidBoardVendor.mk
+-include vendor/samsung/p1/AndroidBoardVendor.mk

AndroidProducts.mk

@@ -1,4 +1,5 @@
-# Copyright (C) 2009 The Android Open Source Project
+#
+# 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.
@@ -11,11 +12,18 @@
 # 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.
+#
 
 #
-# This file lists the product definition files that define
-# configurations which are actually buildable (e.g. through lunch)
+# This file should set PRODUCT_MAKEFILES to a list of product makefiles
+# to expose to the build system.  LOCAL_DIR will already be set to
+# the directory containing this file.
+#
+# This file may not rely on the value of any variable other than
+# LOCAL_DIR; do not use any conditionals, and do not look up the
+# value of any variable that isn't set in this file or in a file that
+# it includes.
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_galaxytab.mk
+    $(LOCAL_DIR)/full_p1.mk

BoardConfig.mk

@@ -1,11 +1,10 @@
-#
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright (C) 2007 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
+#      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,
@@ -18,113 +17,14 @@
 # Product-specific compile-time definitions.
 #
 
-# Set this up here so that BoardVendorConfig.mk can override it
-BOARD_USES_GENERIC_AUDIO := false
-
-BOARD_USES_LIBSECRIL_STUB := true
-
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-
-# Use a smaller subset of system fonts to keep image size lower
-SMALLER_FONT_FOOTPRINT := true
-
-# Use the non-open-source parts, if they're present
--include vendor/samsung/galaxytab/BoardConfigVendor.mk
-
-# ARMv7-A Cortex-A8 architecture
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_ARCH_VARIANT := armv7-a-neon
-ARCH_ARM_HAVE_TLS_REGISTER := true
-TARGET_GLOBAL_CFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-ARCH_ARM_HAVE_TLS_REGISTER := true
-
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_RADIOIMAGE := true
-
-TARGET_PROVIDES_INIT := true
-TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/samsung/galaxytab/recovery.rc
-
-TARGET_BOARD_PLATFORM := s5pc110
-TARGET_BOARD_PLATFORM_GPU := POWERVR_SGX540_120
-TARGET_BOOTLOADER_BOARD_NAME := s5pc110
-
-TARGET_PROVIDES_LIBAUDIO := true
+# Prebuilt Kernel
+TARGET_PREBUILT_KERNEL := device/samsung/p1/kernel
 
 # Releasetools
-TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/galaxytab/releasetools/galaxytab_ota_from_target_files
-TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/galaxytab/releasetools/galaxytab_img_from_target_files
-
-# Bluetooth
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
-
-# WiFi related defines
-BOARD_WPA_SUPPLICANT_DRIVER := WEXT
-CONFIG_DRIVER_WEXT := true
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext
-BOARD_WLAN_DEVICE       := bcm4329
-WIFI_DRIVER_MODULE_NAME := "bcm4329"
-WIFI_DRIVER_MODULE_PATH := "/lib/modules/bcm4329.ko"
-WIFI_DRIVER_MODULE_ARG  := "firmware_path=/system/etc/wifi/bcm4329_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt dhd_watchdog_ms=10 dhd_poll=1"
-WIFI_DRIVER_FW_PATH_AP  := "/system/etc/wifi/bcm4329_aps.bin"
-WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcm4329_sta.bin"
-BOARD_WEXT_NO_COMBO_SCAN := true
-BOARD_NETWORK_INTERFACES_DIR := "/sys/devices/virtual/net"
-
-# 3G
-BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0"
-
-# Camera
-USE_CAMERA_STUB := false
-ifeq ($(USE_CAMERA_STUB),false)
-BOARD_CAMERA_LIBRARIES := libcamera
-endif
-BOARD_V4L2_DEVICE := /dev/video1
-BOARD_CAMERA_DEVICE := /dev/video0
-BOARD_SECOND_CAMERA_DEVICE := /dev/video2
-
-# OpenGL stuff
-BOARD_EGL_CFG := device/samsung/galaxytab/prebuilt/lib/egl/egl.cfg
-#BOARD_USES_LEGACY_EGL := true
-USE_OPENGL_RENDERER := true
-
-# Skia
-BOARD_USE_SKIA_LCDTEXT := true
-
-# Indicate that the board has an Internal SD Card
-BOARD_HAS_SDCARD_INTERNAL := true
-
-# Device related defines
-BOARD_NAND_PAGE_SIZE := 4096
-BOARD_NAND_SPARE_SIZE := 128
-BOARD_KERNEL_BASE := 0x32000000
-BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_CMDLINE := console=ttyFIQ0,115200 init=/init no_console_suspend
-TARGET_PREBUILT_KERNEL := device/samsung/galaxytab/kernel
-
-BOARD_BOOTIMAGE_PARTITION_SIZE := 7864320
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 336068608
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 1319108608
-BOARD_FLASH_BLOCK_SIZE := 4096
-
-# Vold
-BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
-
-# Recovery
-#BOARD_USE_CUSTOM_FONT := true
-#BOARD_XHDPI_RECOVERY := true
-TARGET_RECOVERY_PIXEL_FORMAT := "BGRX_8888"
-TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_HAS_NO_SELECT_BUTTON := true
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxytab/shbootimg.mk
-TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery; sync; echo "
-BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/galaxytab/recovery/graphics.c
-
-TARGET_OTA_ASSERT_DEVICE := galaxytab,GT-P1000
+TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/p1/releasetools/p1_ota_from_target_files
+TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/p1/releasetools/p1_img_from_target_files
 
-TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/usb_mass_storage/lun%d/file
+TARGET_OTA_ASSERT_DEVICE := galaxytab, GT-P1000, GT-P1000L, GT-P1000N, GT-P1000R
 
+# Import the p1-common BoardConfigCommon.mk
+include device/samsung/p1-common/BoardConfigCommon.mk

CleanSpec.mk

@@ -49,12 +49,12 @@ $(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm)
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, rm -rf $(TARGET_OUT)/build.prop)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/SHARED_LIBRARIES/libaudio_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/SHARED_LIBRARIES/libaudio_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/STATIC_LIBRARIES/libasound_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/EXECUTABLES/alsa_*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/system/bin/alsa_*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/system/etc/asound.conf)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/system/usr/share/alsa)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/PACKAGING/systemimage_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/galaxytab/obj/SHARED_LIBRARIES/libaudio_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/SHARED_LIBRARIES/libaudio_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/SHARED_LIBRARIES/libaudio_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/STATIC_LIBRARIES/libasound_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/EXECUTABLES/alsa_*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/system/bin/alsa_*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/system/etc/asound.conf)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/system/usr/share/alsa)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/PACKAGING/systemimage_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p1/obj/SHARED_LIBRARIES/libaudio_intermediates)