Code refine: remove ANDROID THINGS

Tracked-On: OAM-91436
Signed-off-by: Chen Gang G <gang.g.chen@intel.com>

Author: GangSecurity

Android.mk

@@ -71,10 +71,6 @@ ifeq ($(TARGET_NO_DEVICE_UNLOCK),true)
     KERNELFLINGER_CFLAGS += -DNO_DEVICE_UNLOCK
 endif
 
-ifeq ($(BUILD_ANDROID_THINGS),true)
-    KERNELFLINGER_CFLAGS += -DBUILD_ANDROID_THINGS
-endif
-
 ifeq ($(HAL_AUTODETECT),true)
     KERNELFLINGER_CFLAGS += -DHAL_AUTODETECT
 endif

README.md

@@ -105,7 +105,6 @@ Kerneflinger specific configuration flags:
    BoringSSL library. 
 * `BOARD_AVB_ENABLE`: support AVB (Android Verify Boot)
 * `BOARD_SLOT_AB_ENABLE`: support AVB A/B slot.
-* `BUILD_ANDROID_THINGS`: enable some feature for Android Things.
 
 Command line parameters
 -----------------------

avb/Android.mk

@@ -95,11 +95,6 @@ LOCAL_SRC_FILES := \
     libavb_ab/avb_ab_flow.c \
     libavb/avb_sha256.c
 
-ifeq ($(BUILD_ANDROID_THINGS),true)
-LOCAL_SRC_FILES += \
-    libavb_atx/avb_atx_validate.c
-endif
-
 LOCAL_C_INCLUDES := \
 	$(addprefix $(LOCAL_PATH)/,../libkernelflinger) \
 	$(addprefix $(LOCAL_PATH)/,../libsslsupport)

kernelflinger.c

@@ -909,13 +909,8 @@ static EFI_STATUS load_image(VOID *bootimage, UINT8 boot_state,
 		set_boottime_stamp(TM_LOAD_TOS_DONE);
 		ret = start_trusty(tosimage);
 		if (EFI_ERROR(ret)) {
-#ifndef BUILD_ANDROID_THINGS
 			efi_perror(ret, L"Unable to start trusty; stop.");
 			die();
-#else
-			efi_perror(ret, L"Unable to start trusty");
-			efi_perror(ret, L"Continue to boot");
-#endif
 		}
 		set_boottime_stamp(TM_PROCRSS_TRUSTY_DONE);
 	}

libfastboot/fastboot.c

@@ -328,15 +328,9 @@ EFI_STATUS fastboot_publish(const char *name, const char *value)
 	return EFI_SUCCESS;
 }
 
-#ifdef BUILD_ANDROID_THINGS
-#define EXT4_PART_GUID	\
-	{ 0x0bb7e6ed, 0x4424, 0x49c0, \
-	  { 0x93, 0x72, 0x7f, 0xba, 0xb4, 0x65, 0xab, 0x4c } }
-#else
 #define EXT4_PART_GUID	\
 	{ 0x0fc63daf, 0x8483, 0x4772, \
 	  { 0x8e, 0x79, 0x3d, 0x69, 0xd8, 0x47, 0x7d, 0xe4 } }
-#endif
 
 static const char *get_ptype_str(EFI_GUID *guid)
 {
@@ -460,7 +454,6 @@ static EFI_STATUS publish_slots(void)
 	if (EFI_ERROR(ret))
 		return ret;
 
-#ifndef BUILD_ANDROID_THINGS
 	for (i = 0, j = 0; i < nb_slots; i++) {
 		len = efi_snprintf((CHAR8 *)var + j, sizeof(var) - j,
 				   i == 0 ? (CHAR8 *)"%a" : (CHAR8 *)",%a",
@@ -473,7 +466,6 @@ static EFI_STATUS publish_slots(void)
 	ret = fastboot_publish("slot-suffixes", var);
 	if (EFI_ERROR(ret))
 		return ret;
-#endif
 
 	for (i = 0; i < nb_slots; i++)
 		for (j = 0; j < ARRAY_SIZE(descriptors); j++) {
@@ -1256,11 +1248,6 @@ static EFI_STATUS fastboot_init()
 	char download_max_str[30];
 	static char default_command_buffer[MAGIC_LENGTH];
 
-#ifdef BUILD_ANDROID_THINGS
-	UINTN size;
-	char* data = NULL;
-#endif
-
 	ret = fastboot_set_command_buffer(default_command_buffer,
 					  sizeof(default_command_buffer));
 	if (EFI_ERROR(ret)) {
@@ -1290,18 +1277,6 @@ static EFI_STATUS fastboot_init()
 	if (EFI_ERROR(ret))
 		goto error;
 
-#ifdef BUILD_ANDROID_THINGS
-	/* publish serial number*/
-	ret = get_efi_variable(&loader_guid, SERIAL_NUM_VAR, &size, (VOID **)&data,
-		NULL);
-	if (EFI_ERROR(ret) || !data || !size)
-		fastboot_publish("SerialNum", NULL);
-	else
-		fastboot_publish("SerialNum", data);
-
-	data = NULL;
-#endif
-
 	ret = fastboot_publish("variant", info_variant());
 	if (EFI_ERROR(ret))
 		goto error;

libfastboot/fastboot_oem.c

@@ -634,29 +634,6 @@ static void cmd_fuse(INTN argc, CHAR8 **argv)
 	fastboot_run_cmd(cmdlist_fuse, (char *)argv[1], argc - 1, argv + 1);
 }
 
-#ifdef BUILD_ANDROID_THINGS
-static void cmd_fuse_atperm(INTN argc, __attribute__((__unused__)) CHAR8 **argv)
-{
-	EFI_STATUS ret;
-	struct download_buffer *dl;
-
-	if (argc != 1) {
-		fastboot_fail("Invalid parameters");
-		return;
-	}
-
-	dl = fastboot_download_buffer();
-
-	ret = tpm2_fuse_perm_attr(dl->data, dl->size);
-	if (EFI_ERROR(ret)) {
-		fastboot_fail("Fusing AT PERM failed, %r", ret);
-		return;
-	}
-
-	fastboot_okay("");
-}
-#endif  // BUILD_ANDROID_THINGS
-
 static void cmd_fuse_vbmeta_key_hash(INTN argc, __attribute__((__unused__)) CHAR8 **argv)
 {
 	EFI_STATUS ret;
@@ -769,9 +746,6 @@ static struct fastboot_cmd COMMANDS[] = {
 
 #ifdef USE_TPM
 static struct fastboot_cmd COMMANDS_FUSE[] = {
-#ifdef BUILD_ANDROID_THINGS
-	{ "at-perm-attr",		LOCKED,		cmd_fuse_atperm },
-#endif
 	{ "vbmeta-key-hash",		UNLOCKED,	cmd_fuse_vbmeta_key_hash },
 	{ "bootloader-policy",		UNLOCKED,	cmd_fuse_bootloader_policy },
 	{ "lock-tpm2-owner",		UNLOCKED,	cmd_fuse_tpm2_lock_owner },

libkernelflinger/Android.mk

@@ -256,9 +256,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../avb
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../avb/libavb
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../avb/libavb_ab
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../avb/libavb_user
-ifeq ($(BUILD_ANDROID_THINGS),true)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../avb/libavb_atx
-endif
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include/libqltipc
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include/libheci
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include/libelfloader

libkernelflinger/tpm2_security.c

@@ -816,15 +816,6 @@ static EFI_STATUS tpm2_check_trusty_seed_index(void)
 	return EFI_SUCCESS;
 }
 
-#ifdef BUILD_ANDROID_THINGS
-EFI_STATUS tpm2_fuse_perm_attr(
-		__attribute__((__unused__)) void *data,
-		__attribute__((__unused__)) uint32_t size)
-{
-	return EFI_UNSUPPORTED;
-}
-#endif
-
 EFI_STATUS tpm2_fuse_vbmeta_key_hash(
 		__attribute__((__unused__)) void *data,
 		__attribute__((__unused__)) uint32_t size)

libkernelflinger/vars.c

@@ -816,11 +816,7 @@ char *get_serial_number(void)
 		goto bad;
 	}
 
-#ifdef BUILD_ANDROID_THINGS
-	efi_snprintf((CHAR8*)serialno, SERIALNO_MAX_SIZE, (CHAR8*) "%a%a", TARGET_BOOTLOADER_BOARD_NAME, bios_serialno);
-#else
 	efi_snprintf((CHAR8*)serialno, SERIALNO_MAX_SIZE, (CHAR8*) "%a", bios_serialno);
-#endif
 
 	for (pos = serialno; *pos; pos++) {
 		/* Replace foreign characters with zeroes */
@@ -846,19 +842,7 @@ char *get_serial_number(void)
 
 	return serialno;
 bad:
-#ifdef BUILD_ANDROID_THINGS
-	pos = get_serialno_var();
-	if (pos == NULL) {
-		error(L"SERIAL number is NULL\n");
-		strncpy_s((CHAR8 *)serialno, sizeof(serialno), (CHAR8 *)"00badbios00badbios00", SERIALNO_MAX_SIZE);
-	} else {
-		error(L"Valid serial number read from EFI vars\n");
-		strncpy_s((CHAR8 *)serialno, sizeof(serialno), (CHAR8 *)pos, SERIALNO_MAX_SIZE);
-		FreePool(pos);
-	}
-#else
 	strncpy_s((CHAR8 *)serialno, sizeof(serialno), (CHAR8 *)"00badbios00badbios00", SERIALNO_MAX_SIZE);
-#endif
 	return serialno;
 }
 

ux.c

@@ -39,11 +39,7 @@
 #include "adb.h"
 #endif
 
-#ifdef BUILD_ANDROID_THINGS
-#define FIRST_TIMEOUT_SECS	1
-#else
 #define FIRST_TIMEOUT_SECS	5
-#endif
 #define SECOND_TIMEOUT_SECS	30
 
 #define PRESS_TO_PAUSE_FMT		"Press %a to pause %a"
@@ -365,11 +361,7 @@ enum boot_target ux_prompt_user(enum ux_error_code code, BOOLEAN power_off, UINT
 		footer_text[4].str = "BOOT_STATE is RED but allow to boot anyway on eng builds!";
 		display_text(code, prompt->color, empty_text, text, footer_text);
 #endif
-#ifdef BUILD_ANDROID_THINGS
-		ui_wait_for_event(FIRST_TIMEOUT_SECS, EV_TIMEOUT);
-#else
 		ui_wait_for_event(SECOND_TIMEOUT_SECS, EV_TIMEOUT);
-#endif
 		goto out;
 	}