Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43c06e5 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge changes I66b09cd4,I1847ab2b into main 

* changes:
  Configure bootclasspath for sdk product
  Remove sdk_<arch> products
parents 6a6e7731 dde748a8

target/product/AndroidProducts.mk

+0 −3
Original line number Diff line number Diff line
@@ -66,14 +66,11 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/mainline_system_x86_64.mk \

    $(LOCAL_DIR)/mainline_system_x86_arm.mk \

    $(LOCAL_DIR)/ndk.mk \

    $(LOCAL_DIR)/sdk_arm64.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sdk_phone_arm64.mk \

    $(LOCAL_DIR)/sdk_phone_armv7.mk \

    $(LOCAL_DIR)/sdk_phone_x86_64.mk \

    $(LOCAL_DIR)/sdk_phone_x86.mk \

    $(LOCAL_DIR)/sdk_x86_64.mk \

    $(LOCAL_DIR)/sdk_x86.mk \



endif

target/product/sdk.mk

+13 −2
Original line number Diff line number Diff line
@@ -14,8 +14,19 @@ 
# limitations under the License.

#



# Don't modify this file - It's just an alias!

# This is a simple product that uses configures the minimum amount

# needed to build the SDK (without the emulator).



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_x86.mk)

# In order to build the bootclasspath sources, the bootclasspath needs to

# be setup via default_art_config.mk. The sources only really make sense

# together with a device (e.g. the emulator). So if the SDK sources change

# to be built with the device, this could be removed.

$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)



$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)



PRODUCT_NAME := sdk

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_x86



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

target/product/sdk_arm64.mk

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#

# Copyright (C) 2014 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.

#



$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)



TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true



PRODUCT_NAME := sdk_arm64

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_arm64



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

target/product/sdk_x86.mk

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#

# Copyright (C) 2014 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 simple product that uses configures the minimum amount

# needed to build the SDK (without the emulator).



$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)



PRODUCT_NAME := sdk_x86_64

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_x86



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

target/product/sdk_x86_64.mk

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#

# Copyright (C) 2014 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 simple product that uses configures the minimum amount

# needed to build the SDK (without the emulator).



$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)



TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true



PRODUCT_NAME := sdk_x86_64

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_x86_64



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true