From db4fc200c47d37b73d21c71c8923e4a844f9fde0 Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Fri, 4 Oct 2013 16:02:59 -0700 Subject: [PATCH] Add generic aarch64 board config and build rules. Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530 --- core/combo/TARGET_linux-aarch64.mk | 232 +++++++++++ core/combo/arch/aarch64/armv8-a.mk | 1 + .../arch/linux-aarch64/AndroidConfig.h | 362 ++++++++++++++++++ envsetup.sh | 2 + target/board/generic_aarch64/BoardConfig.mk | 53 +++ target/board/generic_aarch64/README.txt | 5 + target/board/generic_aarch64/device.mk | 31 ++ target/board/generic_aarch64/system.prop | 6 + target/product/AndroidProducts.mk | 4 +- target/product/aosp_aarch64.mk | 29 ++ 10 files changed, 724 insertions(+), 1 deletion(-) create mode 100644 core/combo/TARGET_linux-aarch64.mk create mode 100644 core/combo/arch/aarch64/armv8-a.mk create mode 100644 core/combo/include/arch/linux-aarch64/AndroidConfig.h create mode 100644 target/board/generic_aarch64/BoardConfig.mk create mode 100644 target/board/generic_aarch64/README.txt create mode 100644 target/board/generic_aarch64/device.mk create mode 100644 target/board/generic_aarch64/system.prop create mode 100644 target/product/aosp_aarch64.mk diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk new file mode 100644 index 0000000000..bb328c555f --- /dev/null +++ b/core/combo/TARGET_linux-aarch64.mk @@ -0,0 +1,232 @@ +# +# Copyright (C) 2013 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. +# + +# Configuration for Linux on ARM. +# Included by combo/select.mk + +# You can set TARGET_ARCH_VARIANT to use an arch version other +# than ARMv5TE. Each value should correspond to a file named +# $(BUILD_COMBOS)/arch/.mk which must contain +# makefile variable definitions similar to the preprocessor +# defines in build/core/combo/include/arch//AndroidConfig.h. Their +# purpose is to allow module Android.mk files to selectively compile +# different versions of code based upon the funtionality and +# instructions available in a given architecture version. +# +# The blocks also define specific arch_variant_cflags, which +# include defines, and compiler settings for the given architecture +# version. +# +ifeq ($(strip $(TARGET_ARCH_VARIANT)),) +TARGET_ARCH_VARIANT := armv8 +endif + +ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) +TARGET_GCC_VERSION := 4.8 +else +TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) +endif + +TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk +ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) +$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) +endif + +include $(TARGET_ARCH_SPECIFIC_MAKEFILE) + +# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else +ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/aarch64/aarch64-linux-android-$(TARGET_GCC_VERSION) +TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/aarch64-linux-android- +endif + +TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) +TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX) +TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX) +TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX) +TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX) +TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) +ifeq ($(TARGET_BUILD_VARIANT),user) + TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@ +else + TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@ && \ + $(TARGET_OBJCOPY) --add-gnu-debuglink=$< $@ +endif + +TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined + +android_config_h := $(call select-android-config-h,linux-aarch64) + +TARGET_GLOBAL_CFLAGS += \ + -fpic -fPIE \ + $(arch_variant_cflags) \ + -include $(android_config_h) \ + -I $(dir $(android_config_h)) + +TARGET_GLOBAL_CFLAGS += \ + -fpic -fPIE \ + -ffunction-sections \ + -fdata-sections \ + -funwind-tables \ + -Wa,--noexecstack \ + -Werror=format-security \ + -D_FORTIFY_SOURCE=2 \ + -fno-short-enums \ + $(arch_variant_cflags) \ + -include $(android_config_h) \ + -I $(dir $(android_config_h)) + +TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields + +# This is to avoid the dreaded warning compiler message: +# note: the mangling of 'va_list' has changed in GCC 4.4 +# +# The fact that the mangling changed does not affect the NDK ABI +# very fortunately (since none of the exposed APIs used va_list +# in their exported C++ functions). Also, GCC 4.5 has already +# removed the warning from the compiler. +# +TARGET_GLOBAL_CFLAGS += -Wno-psabi + +TARGET_GLOBAL_LDFLAGS += \ + -Wl,-z,noexecstack \ + -Wl,-z,relro \ + -Wl,-z,now \ + -Wl,--warn-shared-textrel \ + -Wl,--fatal-warnings \ + $(arch_variant_ldflags) + +TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden + +# More flags/options can be added here +TARGET_RELEASE_CFLAGS := \ + -DNDEBUG \ + -O2 -g \ + -Wstrict-aliasing=2 \ + -fgcse-after-reload \ + -frerun-cse-after-loop \ + -frename-registers + +libc_root := bionic/libc +libm_root := bionic/libm +libstdc++_root := bionic/libstdc++ +libthread_db_root := bionic/libthread_db + + +# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use +# symlinks located in out/ to point to the appropriate kernel +# headers. see 'config/kernel_headers.make' for more details +# +ifneq ($(CUSTOM_KERNEL_HEADERS),) + KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) + KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) +else + KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common + KERNEL_HEADERS_ARCH := $(libc_root)/kernel/arch-$(TARGET_ARCH) +endif +KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) + +TARGET_C_INCLUDES := \ + $(libc_root)/arch-aarch64/include \ + $(libc_root)/include \ + $(libstdc++_root)/include \ + $(KERNEL_HEADERS) \ + $(libm_root)/include \ + $(libm_root)/include/aarch64 \ + $(libthread_db_root)/include + +# FIXME +# CRT* objects to be added later +TARGET_CRTBEGIN_STATIC_O := +TARGET_CRTBEGIN_DYNAMIC_O := +TARGET_CRTEND_O := + +TARGET_CRTBEGIN_SO_O := +TARGET_CRTEND_SO_O := + +TARGET_STRIP_MODULE:=true + +TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm + +TARGET_CUSTOM_LD_COMMAND := true + +define transform-o-to-shared-lib-inner +$(hide) $(PRIVATE_CXX) \ + -nostdlib -Wl,-soname,$(notdir $@) \ + -Wl,-shared,-Bsymbolic \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ + $(PRIVATE_TARGET_FDO_LIB) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ + -o $@ \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_TARGET_LIBGCC) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) +endef + +define transform-o-to-executable-inner +$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ + -Wl,-dynamic-linker,/system/bin/linker \ + -Wl,-z,nocopyreloc \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ + -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ + $(PRIVATE_TARGET_FDO_LIB) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ + -o $@ \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_TARGET_LIBGCC) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) +endef + +define transform-o-to-static-executable-inner +$(hide) $(PRIVATE_CXX) -Bstatic \ + -o $@ \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ + $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ + -Wl,--start-group \ + $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ + $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ + $(PRIVATE_TARGET_FDO_LIB) \ + $(PRIVATE_TARGET_LIBGCC) \ + -Wl,--end-group \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) +endef diff --git a/core/combo/arch/aarch64/armv8-a.mk b/core/combo/arch/aarch64/armv8-a.mk new file mode 100644 index 0000000000..edc0497eeb --- /dev/null +++ b/core/combo/arch/aarch64/armv8-a.mk @@ -0,0 +1 @@ +arch_variant_cflags := diff --git a/core/combo/include/arch/linux-aarch64/AndroidConfig.h b/core/combo/include/arch/linux-aarch64/AndroidConfig.h new file mode 100644 index 0000000000..77c8912899 --- /dev/null +++ b/core/combo/include/arch/linux-aarch64/AndroidConfig.h @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2013 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. + */ + +/* + * Android config -- "android-aarch64". Used for ARM aarch64 device builds. + */ +#ifndef _ANDROID_CONFIG_H +#define _ANDROID_CONFIG_H + +/* + * =========================================================================== + * !!! IMPORTANT !!! + * =========================================================================== + * + * This file is included by ALL C/C++ source files. Don't put anything in + * here unless you are absolutely certain it can't go anywhere else. + * + * Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//" + * comments. + */ + +/* + * Threading model. Choose one: + * + * HAVE_PTHREADS - use the pthreads library. + * HAVE_WIN32_THREADS - use Win32 thread primitives. + * -- combine HAVE_CREATETHREAD, HAVE_CREATEMUTEX, and HAVE__BEGINTHREADEX + */ +#define HAVE_PTHREADS + +/* + * Do we have pthread_setname_np()? + * + * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with + * the same name but different parameters, so we can't use that here.) + */ +#define HAVE_ANDROID_PTHREAD_SETNAME_NP + +/* + * Do we have the futex syscall? + */ +#define HAVE_FUTEX + +/* + * Define if we already have the futex wrapper functions defined. Yes if + * compiling against bionic. + */ +#define HAVE_FUTEX_WRAPPERS 1 + +/* + * Process creation model. Choose one: + * + * HAVE_FORKEXEC - use fork() and exec() + * HAVE_WIN32_PROC - use CreateProcess() + */ +#define HAVE_FORKEXEC + +/* + * Process out-of-memory adjustment. Set if running on Linux, + * where we can write to /proc//oom_adj to modify the out-of-memory + * badness adjustment. + */ +#define HAVE_OOM_ADJ + +/* + * IPC model. Choose one: + * + * HAVE_SYSV_IPC - use the classic SysV IPC mechanisms (semget, shmget). + * HAVE_MACOSX_IPC - use Macintosh IPC mechanisms (sem_open, mmap). + * HAVE_WIN32_IPC - use Win32 IPC (CreateSemaphore, CreateFileMapping). + * HAVE_ANDROID_IPC - use Android versions (?, mmap). + */ +#define HAVE_ANDROID_IPC + +/* + * Memory-mapping model. Choose one: + * + * HAVE_POSIX_FILEMAP - use the Posix sys/mmap.h + * HAVE_WIN32_FILEMAP - use Win32 filemaps + */ +#define HAVE_POSIX_FILEMAP + +/* + * Define this if you have + */ +#define HAVE_TERMIO_H 1 + +/* + * Define this if you have + */ +#define HAVE_SYS_SENDFILE_H 1 + +/* + * Define this if you build against MSVCRT.DLL + */ +/* #define HAVE_MS_C_RUNTIME */ + +/* + * Define this if you have sys/uio.h + */ +#define HAVE_SYS_UIO_H 1 + +/* + * Define this if your platforms implements symbolic links + * in its filesystems + */ +#define HAVE_SYMLINKS + +/* + * Define this if we have localtime_r(). + */ +/* #define HAVE_LOCALTIME_R 1 */ + +/* + * Define this if we have gethostbyname_r(). + */ +/* #define HAVE_GETHOSTBYNAME_R */ + +/* + * Define this if we have ioctl(). + */ +#define HAVE_IOCTL + +/* + * Define this if we want to use WinSock. + */ +/* #define HAVE_WINSOCK */ + +/* + * Define this if have clock_gettime() and friends + */ +#define HAVE_POSIX_CLOCKS + +/* + * Define this if we have pthread_cond_timedwait_monotonic() and + * clock_gettime(CLOCK_MONOTONIC). + */ +#define HAVE_TIMEDWAIT_MONOTONIC + +/* + * Define this if we have linux style epoll() + */ +#define HAVE_EPOLL + +/* + * Endianness of the target machine. Choose one: + * + * HAVE_ENDIAN_H -- have endian.h header we can include. + * HAVE_LITTLE_ENDIAN -- we are little endian. + * HAVE_BIG_ENDIAN -- we are big endian. + */ +#define HAVE_ENDIAN_H +#define HAVE_LITTLE_ENDIAN + +#define _FILE_OFFSET_BITS 64 +#define _LARGEFILE_SOURCE 1 + +/* + * Define if platform has off64_t (and lseek64 and other xxx64 functions) + */ +#define HAVE_OFF64_T + +/* + * Defined if we have the backtrace() call for retrieving a stack trace. + * Needed for CallStack to operate; if not defined, CallStack is + * non-functional. + */ +#define HAVE_BACKTRACE 0 + +/* + * Defined if we have the cxxabi.h header for demangling C++ symbols. If + * not defined, stack crawls will be displayed with raw mangled symbols + */ +#define HAVE_CXXABI 0 + +/* + * Defined if we have the gettid() system call. + */ +#define HAVE_GETTID + +/* + * Defined if we have the sched_setscheduler() call + */ +#define HAVE_SCHED_SETSCHEDULER + +/* + * Add any extra platform-specific defines here. + */ +#ifndef __linux__ +#define __linux__ +#endif + +/* + * Define if we have header + */ +#define HAVE_MALLOC_H + +/* + * Define if we're running on *our* linux on device or emulator. + */ +#define HAVE_ANDROID_OS 1 + +/* + * Define if we have Linux-style non-filesystem Unix Domain Sockets + */ +#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1 + +/* + * Define if we have Linux's inotify in . + */ +#define HAVE_INOTIFY 1 + +/* + * Define if we have madvise() in + */ +#define HAVE_MADVISE 1 + +/* + * Define if tm struct has tm_gmtoff field + */ +#define HAVE_TM_GMTOFF 1 + +/* + * Define if dirent struct has d_type field + */ +#define HAVE_DIRENT_D_TYPE 1 + +/* + * Define if libc includes Android system properties implementation. + */ +#define HAVE_LIBC_SYSTEM_PROPERTIES 1 + +/* + * Define if system provides a system property server (should be + * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES). + */ +/* #define HAVE_SYSTEM_PROPERTY_SERVER */ + +/* + * What CPU architecture does this platform use? + */ +#define ARCH_AARCH64 + +/* + * Define if the size of enums is as short as possible, + */ +/* #define HAVE_SHORT_ENUMS */ + +/* + * sprintf() format string for shared library naming. + */ +#define OS_SHARED_LIB_FORMAT_STR "lib%s.so" + +/* + * Do we have __memcmp16()? + */ +#define HAVE__MEMCMP16 1 + +/* + * type for the third argument to mincore(). + */ +#define MINCORE_POINTER_TYPE unsigned char * + +/* + * Do we have the sigaction flag SA_NOCLDWAIT? + */ +#define HAVE_SA_NOCLDWAIT + +/* + * The default path separator for the platform + */ +#define OS_PATH_SEPARATOR '/' + +/* + * Is the filesystem case sensitive? + */ +#define OS_CASE_SENSITIVE + +/* + * Define if exists. + */ +#define HAVE_SYS_SOCKET_H 1 + +/* + * Define if the strlcpy() function exists on the system. + */ +#define HAVE_STRLCPY 1 + +/* + * Define if the open_memstream() function exists on the system. + */ +/* #define HAVE_OPEN_MEMSTREAM 1 */ + +/* + * Define if the BSD funopen() function exists on the system. + */ +#define HAVE_FUNOPEN 1 + +/* + * Define if prctl() exists + */ +#define HAVE_PRCTL 1 + +/* + * Define if writev() exists + */ +#define HAVE_WRITEV 1 + +/* + * Define if exists. + */ +#define HAVE_STDINT_H 1 + +/* + * Define if exists. + */ +#define HAVE_STDBOOL_H 1 + +/* + * Define if exists. + */ +#define HAVE_SCHED_H 1 + +/* + * Define if pread() exists + */ +#define HAVE_PREAD 1 + +/* + * Define if we have st_mtim in struct stat + */ +#define HAVE_STAT_ST_MTIM 1 + +/* + * Define if printf() supports %zd for size_t arguments + */ +#define HAVE_PRINTF_ZD 1 + +/* + * Define to 1 if provides qsort_r() with a BSD style function prototype. + */ +#define HAVE_BSD_QSORT_R 0 + +/* + * Define to 1 if provides qsort_r() with a GNU style function prototype. + */ +#define HAVE_GNU_QSORT_R 0 + +#endif /* _ANDROID_CONFIG_H */ diff --git a/envsetup.sh b/envsetup.sh index 71b0ba7839..2ae7cb83b4 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -132,6 +132,8 @@ function setpaths() ;; arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin ;; + aarch64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin + ;; mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin ;; *) diff --git a/target/board/generic_aarch64/BoardConfig.mk b/target/board/generic_aarch64/BoardConfig.mk new file mode 100644 index 0000000000..b4dfa97301 --- /dev/null +++ b/target/board/generic_aarch64/BoardConfig.mk @@ -0,0 +1,53 @@ +# Copyright (C) 2013 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. +# + +# The generic product target doesn't have any hardware-specific pieces. +TARGET_NO_BOOTLOADER := true +TARGET_NO_KERNEL := true +TARGET_ARCH := aarch64 +TARGET_ARCH_VARIANT := armv8-a +TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := aarch64-v8a + +# no hardware camera +USE_CAMERA_STUB := true + +# Enable dex-preoptimization to speed up the first boot sequence +# of an SDK AVD. Note that this operation only works on Linux for now +ifeq ($(HOST_OS),linux) + ifeq ($(WITH_DEXPREOPT),) + WITH_DEXPREOPT := true + endif +endif + +# Build OpenGLES emulation host and guest libraries +BUILD_EMULATOR_OPENGL := true + +# Build and enable the OpenGL ES View renderer. When running on the emulator, +# the GLES renderer disables itself if host GL acceleration isn't available. +USE_OPENGL_RENDERER := true + +TARGET_USERIMAGES_USE_EXT4 := true +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200 +BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 +BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_FLASH_BLOCK_SIZE := 512 +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true + +# FIXME +# Temporarily disable linking against compiler_rt until there is an aarch64 +# version +WITHOUT_LIBCOMPILER_RT := true diff --git a/target/board/generic_aarch64/README.txt b/target/board/generic_aarch64/README.txt new file mode 100644 index 0000000000..681c31e27d --- /dev/null +++ b/target/board/generic_aarch64/README.txt @@ -0,0 +1,5 @@ +The "generic_aarch64" product defines a non-hardware-specific aarch64 target +without a kernel or bootloader. + +It is not a product "base class"; no other products inherit +from it or use it in any way. diff --git a/target/board/generic_aarch64/device.mk b/target/board/generic_aarch64/device.mk new file mode 100644 index 0000000000..8582e5bff6 --- /dev/null +++ b/target/board/generic_aarch64/device.mk @@ -0,0 +1,31 @@ +# +# Copyright (C) 2013 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. +# + +# This is a build configuration for the product aspects that +# are specific to the emulator. + +PRODUCT_PROPERTY_OVERRIDES := \ + ro.ril.hsxpa=1 \ + ro.ril.gprsclass=10 \ + ro.adb.qemud=1 + +PRODUCT_COPY_FILES := \ + device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml + +PRODUCT_PACKAGES := \ + audio.primary.goldfish diff --git a/target/board/generic_aarch64/system.prop b/target/board/generic_aarch64/system.prop new file mode 100644 index 0000000000..29e4be9e69 --- /dev/null +++ b/target/board/generic_aarch64/system.prop @@ -0,0 +1,6 @@ +# +# system.prop for generic aarch64 sdk +# + +rild.libpath=/system/lib/libreference-ril.so +rild.libargs=-d /dev/ttyS0 diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 1a559be16f..e3298a9c29 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -40,7 +40,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/aosp_mips.mk \ - $(LOCAL_DIR)/full_mips.mk + $(LOCAL_DIR)/full_mips.mk \ + $(LOCAL_DIR)/aosp_aarch64.mk else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ @@ -53,6 +54,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/aosp_mips.mk \ $(LOCAL_DIR)/full_mips.mk \ + $(LOCAL_DIR)/aosp_aarch64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ $(LOCAL_DIR)/full_x86_64.mk \ $(LOCAL_DIR)/vbox_x86.mk \ diff --git a/target/product/aosp_aarch64.mk b/target/product/aosp_aarch64.mk new file mode 100644 index 0000000000..67b7dde643 --- /dev/null +++ b/target/product/aosp_aarch64.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2013 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. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_aarch64/device.mk) + +include $(SRC_TARGET_DIR)/product/emulator.mk +PRODUCT_NAME := aosp_aarch64 +PRODUCT_DEVICE := generic_aarch64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on ARM aarch64 Emulator