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

Commit 6b28af30 authored by Tom Cherry's avatar Tom Cherry
Browse files

Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED 

/sbin was traditionally used for static binaries on the ramdisk for
Android, but now everything is a shared binary, so this directory is
empty and we do not want to encourage creation of new libraries in
this directory.

Bug: 73660730
Test: build
Change-Id: Ia82d892adfffb6fa325d0c570ae7999e7bb28dc2
parent 727ef103

core/build-system.html

+4 −8
Original line number Diff line number Diff line
@@ -516,8 +516,8 @@ LOCAL_MODULE_RELATIVE_PATH := hw 
example the root filesystem instead of in /system, add these lines to your

Android.mk:</p>

<pre>

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)

LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)

</pre>

<p>For executables and libraries, you need to specify a

<code>LOCAL_UNSTRIPPED_PATH</code> location if you specified a
@@ -527,9 +527,6 @@ the unstripped executables so GDB can find the symbols. 
<code>LOCAL_MODULE_RELATIVE_PATH</code>.</p>

<p>Look in <code>core/envsetup.mk</code> for all of the variables defining

places to build things.</p>

<p>FYI: If you're installing an executable to /sbin, you probably also want to

set <code>LOCAL_FORCE_STATIC_EXCUTABLE := true</code> in your Android.mk, which

will force the linker to only accept static libraries.</p>





<h3>Android.mk variables</h3>
@@ -685,8 +682,7 @@ installed when a given app is installed. 
<h4>LOCAL_FORCE_STATIC_EXECUTABLE</h4>

<p>If your executable should be linked statically, set 

<code>LOCAL_FORCE_STATIC_EXECUTABLE:=true</code>.  There is a very short

list of libraries that we have in static form (currently only libc).  This is

really only used for executables in /sbin on the root filesystem.</p>

list of libraries that we have in static form (currently only libc).</p>



<h4>LOCAL_GENERATED_SOURCES</h4>

<p>Files that you add to <code>LOCAL_GENERATED_SOURCES</code> will be
@@ -812,7 +808,7 @@ them with the directory name:</p> 
<h4>LOCAL_STATIC_LIBRARIES</h4>

<p>These are the static libraries that you want to include in your module.

Mostly, we use shared libraries, but there are a couple of places, like

executables in sbin and host executables where we use static libraries instead.

host executables where we use static libraries instead.

<p><code>LOCAL_STATIC_LIBRARIES := \<br/>

	&nbsp;&nbsp;&nbsp;&nbsp;libutils \<br/>

	&nbsp;&nbsp;&nbsp;&nbsp;libtinyxml

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ $(KATI_obsolete_var \ 
$(KATI_obsolete_var DIST_DIR dist_goal,Use dist-for-goals instead. See $(CHANGES_URL)#dist)

$(KATI_obsolete_var TARGET_ANDROID_FILESYSTEM_CONFIG_H,Use TARGET_FS_CONFIG_GEN instead)

$(KATI_deprecated_var USER,Use BUILD_USERNAME instead. See $(CHANGES_URL)#USER)

$(KATI_obsolete_var TARGET_ROOT_OUT_SBIN,/sbin has been removed, use /system/bin instead)

$(KATI_obsolete_var TARGET_ROOT_OUT_SBIN_UNSTRIPPED,/sbin has been removed, use /system/bin instead)



# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk

$(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword)

core/envsetup.mk

+0 −4
Original line number Diff line number Diff line
@@ -825,7 +825,6 @@ TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin 
TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib

TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/$(TARGET_COPY_OUT_VENDOR)/lib

TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

TARGET_ROOT_OUT_SBIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/sbin

TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin

TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverage

.KATI_READONLY := \
@@ -834,7 +833,6 @@ TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverage 
  TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_ROOT_OUT_UNSTRIPPED \

  TARGET_ROOT_OUT_SBIN_UNSTRIPPED \

  TARGET_ROOT_OUT_BIN_UNSTRIPPED \

  TARGET_OUT_COVERAGE
@@ -843,13 +841,11 @@ TARGET_RAMDISK_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED) 


TARGET_ROOT_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ROOT)

TARGET_ROOT_OUT_BIN := $(TARGET_ROOT_OUT)/bin

TARGET_ROOT_OUT_SBIN := $(TARGET_ROOT_OUT)/sbin

TARGET_ROOT_OUT_ETC := $(TARGET_ROOT_OUT)/etc

TARGET_ROOT_OUT_USR := $(TARGET_ROOT_OUT)/usr

.KATI_READONLY := \

  TARGET_ROOT_OUT \

  TARGET_ROOT_OUT_BIN \

  TARGET_ROOT_OUT_SBIN \

  TARGET_ROOT_OUT_ETC \

  TARGET_ROOT_OUT_USR