Re: [Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-06 Thread Chih-Wei Huang
2017-11-03 19:02 GMT+08:00 Tapani Pälli :
> On 11/03/2017 12:30 PM, Chih-Wei Huang wrote:
>> 2017-11-03 15:47 GMT+08:00 Tapani Pälli :
>>> Hi Chih-Wei;
>>> This looks good to me. Only thing that causes a bit of headache is ...
>>> what
>>> is the difference between PRODUCT_OUT, OUT_DIR and TARGET_OUT?
>>
>> OUT_DIR is also set to "out" if it's not already set.
>>
>> PRODUCT_OUT is where all target files go.
>> (i.e., out/target/product/$device/)
>>
>> TARGET_OUT is $PRODUCT_OUT/system
>>
>> Please see the definitions in build/core/envsetup.mk.
>
> OK, thanks. I'm not sure if TARGET_OUT is correct then, at least on
> Android-IA these vendor files are under:
>
> out/target/product/$device/vendor/lib
>
> so, not under 'system'.

Yes. This patch is used to remove old files under 'system'.
Otherwise the image may contain duplicate libraries
that causes unexpected problems.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-05 Thread Tapani Pälli



On 11/06/2017 04:08 AM, Chih-Wei Huang wrote:

2017-11-03 19:02 GMT+08:00 Tapani Pälli :

On 11/03/2017 12:30 PM, Chih-Wei Huang wrote:

2017-11-03 15:47 GMT+08:00 Tapani Pälli :

Hi Chih-Wei;
This looks good to me. Only thing that causes a bit of headache is ...
what
is the difference between PRODUCT_OUT, OUT_DIR and TARGET_OUT?


OUT_DIR is also set to "out" if it's not already set.

PRODUCT_OUT is where all target files go.
(i.e., out/target/product/$device/)

TARGET_OUT is $PRODUCT_OUT/system

Please see the definitions in build/core/envsetup.mk.


OK, thanks. I'm not sure if TARGET_OUT is correct then, at least on
Android-IA these vendor files are under:

out/target/product/$device/vendor/lib

so, not under 'system'.


Yes. This patch is used to remove old files under 'system'.
Otherwise the image may contain duplicate libraries
that causes unexpected problems.



Right now I get it, thanks!

Reviewed-by: Tapani Pälli 

// Tapani
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-03 Thread Tapani Pälli



On 11/03/2017 12:30 PM, Chih-Wei Huang wrote:

2017-11-03 15:47 GMT+08:00 Tapani Pälli :

Hi Chih-Wei;

This looks good to me. Only thing that causes a bit of headache is ... what
is the difference between PRODUCT_OUT, OUT_DIR and TARGET_OUT?


OUT_DIR is also set to "out" if it's not already set.

PRODUCT_OUT is where all target files go.
(i.e., out/target/product/$device/)

TARGET_OUT is $PRODUCT_OUT/system

Please see the definitions in build/core/envsetup.mk.



OK, thanks. I'm not sure if TARGET_OUT is correct then, at least on 
Android-IA these vendor files are under:


out/target/product/$device/vendor/lib

so, not under 'system'.

// Tapani
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-03 Thread Chih-Wei Huang
2017-11-03 15:47 GMT+08:00 Tapani Pälli :
> Hi Chih-Wei;
>
> This looks good to me. Only thing that causes a bit of headache is ... what
> is the difference between PRODUCT_OUT, OUT_DIR and TARGET_OUT?

OUT_DIR is also set to "out" if it's not already set.

PRODUCT_OUT is where all target files go.
(i.e., out/target/product/$device/)

TARGET_OUT is $PRODUCT_OUT/system

Please see the definitions in build/core/envsetup.mk.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-03 Thread Tapani Pälli

Hi Chih-Wei;

This looks good to me. Only thing that causes a bit of headache is ... 
what is the difference between PRODUCT_OUT, OUT_DIR and TARGET_OUT?


On 11/03/2017 09:36 AM, Chih-Wei Huang wrote:

The libraries are moved to /vendor since commit c3f75d48.
Clean all old files for incremental builds.

Signed-off-by: Chih-Wei Huang 
---
  CleanSpec.mk | 7 +++
  1 file changed, 7 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index d08b0def7d..eca3845354 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -14,3 +14,10 @@ $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermedi
  $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
  $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
  $(call add-clean-step, rm -rf 
$(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)
+
+# Move libraries to /vendor
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/dri/*)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libgbm.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libglapi.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libvulkan_intel.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/egl/libGLES_mesa.so)


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] Android: update CleanSpec.mk

2017-11-03 Thread Chih-Wei Huang
The libraries are moved to /vendor since commit c3f75d48.
Clean all old files for incremental builds.

Signed-off-by: Chih-Wei Huang 
---
 CleanSpec.mk | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index d08b0def7d..eca3845354 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -14,3 +14,10 @@ $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermedi
 $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
 $(call add-clean-step, rm -rf 
$(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
 $(call add-clean-step, rm -rf 
$(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)
+
+# Move libraries to /vendor
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/dri/*)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libgbm.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libglapi.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/libvulkan_intel.so)
+$(call add-clean-step, rm -f $(TARGET_OUT)/lib*/egl/libGLES_mesa.so)
-- 
2.13.6

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev